Backport v2 anti ghosting to v1

# Conflicts:
#	keyboards/bastardkb/blacktyl/rules.mk

.clangd

@@ -1,33 +1,4 @@
 CompileFlags:
-    Add:
-        [
-            -Wno-unknown-attributes,
-            -Wno-maybe-uninitialized,
-            -Wno-unknown-warning-option,
-            -Wno-pointer-to-int-cast,
-            -Wno-int-to-void-pointer-cast,
-            -DPROGMEM=,
-        ]
-    Remove:
-        [
-            -W*,
-            -mmcu=*,
-            -mcpu=*,
-            -mfpu=*,
-            -mfloat-abi=*,
-            -mno-unaligned-access,
-            -mno-thumb-interwork,
-            -mcall-prologues,
-            -D__has_include*,
-            -mlra,
-        ]
-    Compiler: clang
-Diagnostics:
-    UnusedIncludes: None
-    Suppress:
-        [
-            asm_invalid_output_constraint,
-            asm_invalid_input_constraint,
-            invalid_asm_value_for_constraint,
-            anyx86_interrupt_attribute,
-        ]
+  Add: [-Wno-unknown-attributes, -Wno-maybe-uninitialized, -Wno-unknown-warning-option]
+  Remove: [-W*, -mmcu=*, -mcpu=*, -mfpu=*, -mfloat-abi=*, -mno-unaligned-access, -mno-thumb-interwork, -mcall-prologues]
+  Compiler: clang

.editorconfig

@@ -11,8 +11,7 @@ charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
 
- # To match GitHub Actions formatting
-[*.{yaml,yml}]
+[{*.yaml,*.yml}] # To match GitHub Actions formatting
 indent_size = 2
 
 [*.md]

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -38,4 +38,4 @@ body:
   - type: textarea
     attributes:
       label: Additional Context
-      description: Add any other relevant information about the problem here.
+      description: Add any other relevant information about the problem here.

.github/ISSUE_TEMPLATE/config.yml

@@ -1,7 +1,7 @@
 blank_issues_enabled: false
 contact_links:
   - name: QMK Discord
-    url: https://discord.gg/qmk
+    url: https://discord.gg/Uq7gcHh
     about: Ask questions, discuss issues and features. Chill.
   - name: OLKB Subreddit
     url: https://www.reddit.com/r/olkb

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,5 +1,6 @@
 <!--- Provide a general summary of your changes in the title above. -->
 
+<!--- This template is entirely optional and can be removed, but is here to help both you and us. -->
 <!--- Anything on lines wrapped in comments like these will not show up in the final text. -->
 
 ## Description
@@ -14,7 +15,7 @@
 - [ ] New feature
 - [ ] Enhancement/optimization
 - [ ] Keyboard (addition or update)
-- [ ] Keymap/layout (addition or update)
+- [ ] Keymap/layout/userspace (addition or update)
 - [ ] Documentation
 
 ## Issues Fixed or Closed by This PR

.github/labeler.yml

@@ -1,60 +1,46 @@
 core:
-  - changed-files:
-    - any-glob-to-any-file:
-      - quantum/**
-      - tmk_core/**
-      - drivers/**
-      - tests/**
-      - util/**
-      - platforms/**
-      - builddefs/*.mk
-      - Makefile
-      - '*.mk'
+  - quantum/**/*
+  - tmk_core/**/*
+  - drivers/**/*
+  - tests/**/*
+  - util/**/*
+  - platforms/**/*
+  - builddefs/**/*
+  - Makefile
+  - '*.mk'
 dependencies:
-  - changed-files:
-    - all-globs-to-any-file:
-      - lib/**
-      - '!lib/python/**'
+  - any:
+    - 'lib/**/*'
+    - '!lib/python/**/*'
 keyboard:
-  - changed-files:
-    - all-globs-to-any-file:
-      - keyboards/**
-      - '!keyboards/**/keymaps/**'
+  - any:
+    - 'keyboards/**/*'
+    - '!keyboards/**/keymaps/**/*'
 keymap:
-  - changed-files:
-    - any-glob-to-any-file:
-      - users/**
-      - layouts/**
-      - keyboards/**/keymaps/**
+  - users/**/*
+  - layouts/**/*
+  - keyboards/**/keymaps/**/*
 via:
-  - changed-files:
-    - any-glob-to-any-file:
-      - keyboards/**/keymaps/via/*
+  - keyboards/**/keymaps/via/*
 cli:
-  - changed-files:
-    - any-glob-to-any-file:
-      - requirements.txt
-      - lib/python/**
+  - requirements.txt
+  - lib/python/**/*
 python:
-  - changed-files:
-    - any-glob-to-any-file:
-      - '**/*.py'
+  - '**/*.py'
 documentation:
-  - changed-files:
-    - any-glob-to-any-file:
-      - docs/**
-      - builddefs/docsgen/**
+  - docs/**/*
+translation:
+  - docs/fr-fr/**/*
+  - docs/es/**/*
+  - docs/ja/**/*
+  - docs/he-il/**/*
+  - docs/pt-br/**/*
+  - docs/zh-cn/**/*
+  - docs/de/**/*
+  - docs/ru-ru/**/*
 CI:
-  - changed-files:
-    - any-glob-to-any-file:
-      - .github/**
+  - .github/**/*
 dd:
-  - changed-files:
-    - any-glob-to-any-file:
-      - data/constants/**
-      - data/mappings/**
-      - data/schemas/**
-community_module:
-  - changed-files:
-    - any-glob-to-any-file:
-      - modules/**
+  - data/constants/**/*
+  - data/mappings/**/*
+  - data/schemas/**/*

.github/workflows/api.yml

@@ -25,7 +25,7 @@ jobs:
     if: github.repository == 'qmk/qmk_firmware'
 
     steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v4
       with:
         fetch-depth: 1
         persist-credentials: false

.github/workflows/auto_approve.yml

@@ -4,7 +4,7 @@ permissions: {}
 
 on:
   schedule:
-    - cron: "*/30 * * * *"
+    - cron: "*/5 * * * *"
 
 jobs:
   automatic_approve:
@@ -13,8 +13,8 @@ jobs:
     if: github.repository == 'qmk/qmk_firmware'
 
     steps:
-    - uses: zvecr/automatic-approve-action@safe_files
+    - uses: mheap/automatic-approve-action@v1
       with:
         token: ${{ secrets.QMK_BOT_TOKEN }}
-        workflows: "labeler.yml,lint.yml,docs.yml"
-        safe_files: "keyboards/,docs/"
+        workflows: "format.yml,lint.yml,unit_test.yml"
+        dangerous_files: "lib/python/,Makefile,paths.mk,builddefs/"

.github/workflows/auto_tag.yml

@@ -15,7 +15,6 @@ on:
     - quantum/**/*
     - tests/**/*
     - tmk_core/**/*
-    - lib/python/**/*
     - util/**/*
     - Makefile
     - '*.mk'
@@ -28,7 +27,7 @@ jobs:
     if: github.repository == 'qmk/qmk_firmware'
 
     steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v4
       with:
         fetch-depth: 0
 

.github/workflows/bootstrap_testing.yml

@@ -1,289 +0,0 @@
-name: Bootstrap Script Testing
-
-on:
-  push:
-    branches: [master, develop, xap]
-    paths:
-    - 'util/env-bootstrap.sh'
-    - '.github/workflows/bootstrap_testing.yml'
-  pull_request:
-    paths:
-    - 'util/env-bootstrap.sh'
-    - '.github/workflows/bootstrap_testing.yml'
-  workflow_dispatch:
-
-permissions:
-  contents: read
-
-jobs:
-  prep:
-    runs-on: ubuntu-latest
-
-    outputs:
-      any_changed: ${{ steps.file_changes.outputs.any_changed }}
-
-    steps:
-    - name: Get changed files
-      id: file_changes
-      if: ${{ github.event_name == 'pull_request' }}
-      uses: tj-actions/changed-files@v47
-      with:
-        use_rest_api: true
-        files: |
-          util/env-bootstrap.sh
-          .github/workflows/bootstrap_testing.yml
-
-  bootstrap-test-linux:
-    name: Bootstrap (Linux)
-
-    needs: prep
-    if: ${{ github.event_name != 'pull_request' || needs.prep.outputs.any_changed == 'true' }}
-
-    runs-on: ubuntu-latest
-
-    strategy:
-      fail-fast: false
-      matrix:
-        distribution:
-          # Ubuntu/Debian based
-          - debian:11
-          - debian:12
-          - debian:13
-          - ubuntu:20.04
-          - ubuntu:22.04
-          - ubuntu:24.04
-
-          # RHEL/CentOS/Fedora based
-          - fedora:41
-          - fedora:42
-          - fedora:43
-          - rockylinux:8
-          - rockylinux:9
-          - rockylinux/rockylinux:10
-          - almalinux:8
-          - almalinux:9
-          - almalinux:10
-
-          # OpenSUSE based (we skip Tumbleweed as it has issues with package versions between pattern installs and other dependencies preinstalled into the base container)
-          - opensuse/leap:latest
-
-          # Gentoo-based
-          - gentoo/stage3:latest
-
-          # Arch based
-          - archlinux:latest
-          - cachyos/cachyos:latest
-          - manjarolinux/base:latest
-
-    container:
-      image: ${{ matrix.distribution }}
-      options: --privileged
-
-    steps:
-      - name: Install base dependencies
-        run: |
-          # Attempt to run the package installation up to 10 times to mitigate transient network issues
-          for n in $(seq 1 10); do
-            {
-              echo "Attempt #$n of 10 to install base dependencies:"
-              case "${{ matrix.distribution }}" in
-                *ubuntu*|*debian*)
-                  apt-get update
-                  apt-get install -y sudo git passwd
-                  ;;
-                *fedora*|*rockylinux*|*almalinux*)
-                  dnf install -y sudo git passwd findutils  # findutils=xargs
-                  ;;
-                *suse*)
-                  zypper --non-interactive refresh
-                  zypper --non-interactive install sudo git shadow findutils  # findutils=xargs
-                  ;;
-                *gentoo*)
-                  emerge-webrsync
-                  emerge --noreplace --ask=n sudo dev-vcs/git shadow findutils  # findutils=xargs
-                  ;;
-                *archlinux*|*cachyos*|*manjaro*)
-                  pacman -Syu --noconfirm
-                  pacman -S --noconfirm sudo git
-                  ;;
-              esac
-            } && break || sleep 10
-          done
-
-          # Fix PAM configuration for sudo in containers
-          # Fix /etc/shadow permissions - common issue in container environments
-          chmod 640 /etc/shadow || chmod 400 /etc/shadow || true
-
-          # Disable problematic PAM modules that commonly fail in RHEL-like containers
-          sed -i 's/^session.*pam_systemd.so/#&/' /etc/pam.d/sudo || true
-          sed -i 's/^session.*pam_loginuid.so/#&/' /etc/pam.d/sudo || true
-
-          # Ensure proper sudoers configuration
-          echo 'Defaults !requiretty' >> /etc/sudoers
-          echo 'Defaults secure_path="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"' >> /etc/sudoers
-
-      - name: Checkout repository
-        uses: actions/checkout@v6
-        with:
-          fetch-depth: 1
-          submodules: recursive
-          path: qmk_firmware
-
-      - name: Create test user
-        run: |
-          # Create a test user for the bootstrap script
-          useradd -m -s /bin/bash -U testuser
-          echo 'testuser:testpassword' | chpasswd || true
-          
-          # Configure passwordless sudo
-          echo "root ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers  # some distros complain about root not being in sudoers
-          echo "testuser ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers
-          
-          # Test sudo functionality
-          sudo -u testuser whoami || echo "Sudo test failed, but continuing..."
-
-      - name: Move QMK repository to test user home
-        run: |
-          # Add upstream remote to the cloned repository so `qmk doctor` doesn't flag a warning
-          git -C qmk_firmware remote add upstream https://github.com/qmk/qmk_firmware.git
-          # Move the QMK repository to the test user's home directory
-          mv qmk_firmware /home/testuser/qmk_firmware
-          chown -R testuser:testuser /home/testuser/qmk_firmware
-
-      - name: Run bootstrap script
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          # Ensure the bootstrap script can access sudo
-          sudo -u testuser --preserve-env=GITHUB_TOKEN bash -c "
-            export CONFIRM=1
-            export PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
-            cd /home/testuser
-            bash /home/testuser/qmk_firmware/util/env-bootstrap.sh
-          "
-
-      - name: Install dependencies
-        run: |
-          sudo -u testuser bash -c "
-            /home/testuser/.local/share/uv/tools/qmk/bin/python -m pip install -r /home/testuser/qmk_firmware/requirements.txt
-          "
-
-      - name: Test QMK CLI
-        run: |
-          sudo -u testuser bash -c "
-            export PATH=/home/testuser/.local/bin:\$PATH
-            cd /home/testuser
-            qmk setup -y -H /home/testuser/qmk_firmware  # setup implies doctor, no need to run it separately
-            cd /home/testuser/qmk_firmware
-            qmk mass-compile -j $(nproc) -e DUMP_CI_METADATA=yes -f 'keyboard_name==*onekey*' -km reset -p || touch .failed  # Compile a bunch of different platforms
-          "
-          
-          cd /home/testuser/qmk_firmware
-          ./util/ci/generate_failure_markdown.sh > $GITHUB_STEP_SUMMARY || true
-          [ ! -e .failed ] || exit 1
-
-  bootstrap-test-macos:
-    name: Bootstrap (macOS)
-
-    needs: prep
-    if: ${{ github.event_name != 'pull_request' || needs.prep.outputs.any_changed == 'true' }}
-
-    strategy:
-      fail-fast: false
-      matrix:
-        os:
-          - macos-14        # Apple Silicon ARM64
-          - macos-15        # Apple Silicon ARM64
-          - macos-15-intel  # Intel x64
-          - macos-26        # Apple Silicon ARM64
-
-    runs-on: ${{ matrix.os }}
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v6
-        with:
-          fetch-depth: 1
-          submodules: recursive
-
-      - name: Run bootstrap script
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          # Add upstream remote to the cloned repository so `qmk doctor` doesn't flag a warning
-          git remote add upstream https://github.com/qmk/qmk_firmware.git
-          # Run the bootstrap script
-          export CONFIRM=1
-          sh ./util/env-bootstrap.sh
-
-      - name: Install dependencies
-        run: |
-          $HOME/.local/share/uv/tools/qmk/bin/python -m pip install -r requirements.txt
-
-      - name: Test QMK CLI
-        run: |
-          # Add QMK CLI to PATH (bootstrap script installs it to ~/.local/bin on macOS)
-          export PATH="$HOME/.local/bin:$PATH"
-          qmk setup -y -H .  # setup implies doctor, no need to run it separately
-          qmk mass-compile -j $(sysctl -n hw.ncpu) -e DUMP_CI_METADATA=yes -f 'keyboard_name==*onekey*' -km reset || touch .failed  # Compile a bunch of different platforms
-          
-          ./util/ci/generate_failure_markdown.sh > $GITHUB_STEP_SUMMARY || true
-          [ ! -e .failed ] || exit 1
-
-  bootstrap-test-windows:
-    name: Bootstrap (Windows)
-
-    needs: prep
-    if: ${{ github.event_name != 'pull_request' || needs.prep.outputs.any_changed == 'true' }}
-
-    strategy:
-      fail-fast: false
-      matrix:
-        msys-variant:
-          - mingw64
-          - clang64
-          - ucrt64
-
-    runs-on: windows-latest
-    defaults:
-      run:
-        shell: msys2 {0}
-
-    steps:
-      - name: Install MSYS2
-        uses: msys2/setup-msys2@v2
-        with:
-          msystem: ${{ matrix.msys-variant }}
-          pacboy: >-
-            git:
-
-      - name: Checkout repository
-        uses: actions/checkout@v6
-        with:
-          fetch-depth: 1
-          submodules: recursive
-
-      - name: Run bootstrap script
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          # Add upstream remote to the cloned repository so `qmk doctor` doesn't flag a warning
-          git remote add upstream https://github.com/qmk/qmk_firmware.git
-          # Run the bootstrap script
-          export CONFIRM=1
-          sh ./util/env-bootstrap.sh
-
-      - name: Install dependencies
-        run: |
-          /opt/uv/tools/qmk/Scripts/python -m pip install -r requirements.txt
-
-      - name: Test QMK CLI
-        run: |
-          # Add QMK CLI to PATH (bootstrap script installs it to /opt/uv/tools/bin on Windows MSYS2)
-          export PATH="/opt/uv/tools/bin:$PATH"
-          qmk setup -y -H .  # setup implies doctor, no need to run it separately
-          qmk mass-compile -j $(nproc) -e DUMP_CI_METADATA=yes -f 'keyboard_name==*onekey*' -km reset || touch .failed  # Compile a bunch of different platforms
-          
-          ./util/ci/generate_failure_markdown.sh > $GITHUB_STEP_SUMMARY || true
-          [ ! -e .failed ] || exit 1
-

.github/workflows/ci_build_major_branch.yml

@@ -6,13 +6,13 @@ permissions:
 
 on:
   push:
-    branches: [master, develop, xap]
+    branches: [master, develop]
   workflow_dispatch:
     inputs:
       branch:
         type: choice
         description: "Branch to build"
-        options: [master, develop, xap]
+        options: [master, develop]
 
 env:
   # https://docs.github.com/en/actions/learn-github-actions/usage-limits-billing-and-administration#usage-limits
@@ -35,24 +35,26 @@ jobs:
       slice_length: ${{ steps.generate_slice_length.outputs.slice_length }}
 
     steps:
+      - name: Install prerequisites
+        run: |
+          apt-get update
+          apt-get install -y jq
+
       - name: Disable safe.directory check
         run: |
           git config --global --add safe.directory '*'
 
       - name: Checkout QMK Firmware
-        uses: actions/checkout@v6
-
-      - name: Install dependencies
-        run: pip3 install -r requirements-dev.txt
+        uses: actions/checkout@v4
 
       - name: Determine concurrency
         id: generate_slice_length
         run: |
           target_count=$( {
             qmk find -km default 2>/dev/null
-            qmk find -km xap 2>/dev/null
+            qmk find -km via 2>/dev/null
           } | sort | uniq | wc -l)
-          slice_length=$((target_count / ($CONCURRENT_JOBS - 1))) # Err on the side of caution
+          slice_length=$((target_count / ($CONCURRENT_JOBS - 1))) # Err on the side of caution as we're splitting default and via
           echo "slice_length=$slice_length" >> $GITHUB_OUTPUT
 
   build_targets:
@@ -61,7 +63,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        keymap: [default, xap]
+        keymap: [default, via]
     uses: ./.github/workflows/ci_build_major_branch_keymap.yml
     with:
       branch: ${{ inputs.branch || github.ref_name }}
@@ -75,59 +77,44 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - name: Disable safe.directory check
-        run: |
-          git config --global --add safe.directory '*'
-
-      - name: Checkout QMK Firmware
-        uses: actions/checkout@v6
-        with:
-          fetch-depth: 0
-
       - name: Download firmwares
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v4
         with:
           pattern: firmware-*
-          path: .
+          path: firmwares
           merge-multiple: true
 
-      - name: Generate index page
-        run: |
-          python3 -m pip install -r ./util/ci/requirements.txt
-          ./util/ci/index_generator.py > index.html
-          ./util/ci/firmware_list_generator.py > firmware_list.json
-
       - name: Upload to https://ci.qmk.fm/${{ inputs.branch || github.ref_name }}/${{ github.sha }}
         uses: jakejarvis/s3-sync-action@master
         with:
-          args: --acl public-read --follow-symlinks --delete --exclude '*' --include 'index.html' --include 'firmware_list.json' --include '*.hex' --include '*.bin' --include '*.uf2'
+          args: --acl public-read --follow-symlinks --delete
         env:
           AWS_S3_BUCKET: ${{ vars.CI_QMK_FM_SPACES_BUCKET }}
           AWS_ACCESS_KEY_ID: ${{ secrets.CI_QMK_FM_SPACES_KEY }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.CI_QMK_FM_SPACES_SECRET }}
           AWS_REGION: ${{ vars.CI_QMK_FM_SPACES_REGION }}
           AWS_S3_ENDPOINT: ${{ vars.CI_QMK_FM_SPACES_ENDPOINT }}
-          SOURCE_DIR: .
+          SOURCE_DIR: firmwares
           DEST_DIR: ${{ inputs.branch || github.ref_name }}/${{ github.sha }}
 
       - name: Upload to https://ci.qmk.fm/${{ inputs.branch || github.ref_name }}/latest
         uses: jakejarvis/s3-sync-action@master
         with:
-          args: --acl public-read --follow-symlinks --delete --exclude '*' --include 'index.html' --include 'firmware_list.json' --include '*.hex' --include '*.bin' --include '*.uf2'
+          args: --acl public-read --follow-symlinks --delete
         env:
           AWS_S3_BUCKET: ${{ vars.CI_QMK_FM_SPACES_BUCKET }}
           AWS_ACCESS_KEY_ID: ${{ secrets.CI_QMK_FM_SPACES_KEY }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.CI_QMK_FM_SPACES_SECRET }}
           AWS_REGION: ${{ vars.CI_QMK_FM_SPACES_REGION }}
           AWS_S3_ENDPOINT: ${{ vars.CI_QMK_FM_SPACES_ENDPOINT }}
-          SOURCE_DIR: .
+          SOURCE_DIR: firmwares
           DEST_DIR: ${{ inputs.branch || github.ref_name }}/latest
 
       - name: Check if failure marker file exists
         id: check_failure_marker
         uses: andstor/file-existence-action@v3
         with:
-          files: ./.failed
+          files: firmwares/.failed
 
       - name: Fail build if needed
         if: steps.check_failure_marker.outputs.files_exists == 'true'

.github/workflows/ci_build_major_branch_keymap.yml

@@ -27,15 +27,17 @@ jobs:
       targets: ${{ steps.generate_targets.outputs.targets }}
 
     steps:
+      - name: Install prerequisites
+        run: |
+          apt-get update
+          apt-get install -y jq
+
       - name: Disable safe.directory check
         run: |
           git config --global --add safe.directory '*'
 
       - name: Checkout QMK Firmware
-        uses: actions/checkout@v6
-
-      - name: Install dependencies
-        run: pip3 install -r requirements-dev.txt
+        uses: actions/checkout@v4
 
       - name: Generate build targets
         id: generate_targets
@@ -60,7 +62,7 @@ jobs:
           echo "targets=$(jq -c 'keys' targets.json)" >> $GITHUB_OUTPUT
 
       - name: Upload targets json
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v4
         with:
           name: targets-${{ inputs.keymap }}
           path: targets.json
@@ -77,18 +79,20 @@ jobs:
         target: ${{ fromJson(needs.generate_targets.outputs.targets) }}
 
     steps:
+      - name: Install prerequisites
+        run: |
+          apt-get update
+          apt-get install -y jq
+
       - name: Disable safe.directory check
         run: |
           git config --global --add safe.directory '*'
 
       - name: Checkout QMK Firmware
-        uses: actions/checkout@v6
-
-      - name: Install dependencies
-        run: pip3 install -r requirements-dev.txt
+        uses: actions/checkout@v4
 
       - name: Get target definitions
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v4
         with:
           name: targets-${{ inputs.keymap }}
           path: .
@@ -105,15 +109,10 @@ jobs:
         continue-on-error: true
         run: |
           export NCPUS=$(( $(nproc 2>/dev/null || sysctl -n hw.ncpu 2>/dev/null || getconf _NPROCESSORS_ONLN 2>/dev/null) -1 ))
-          targets=$(jq -r '.["${{ matrix.target }}"].targets' targets.json | tr ' ' '\n' | sort)
-          if [ -z "${targets}" ]; then
-            echo "Zero build targets detected"
-            exit 0
-          fi
-          qmk mass-compile -t -j $NCPUS -e DUMP_CI_METADATA=yes $targets || touch .failed
+          qmk mass-compile -t -j $NCPUS -e DUMP_CI_METADATA=yes $(jq -r '.["${{ matrix.target }}"].targets' targets.json) || touch .failed
 
       - name: Upload binaries
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v4
         with:
           name: firmware-${{ inputs.keymap }}-${{ matrix.target }}
           if-no-files-found: ignore
@@ -137,17 +136,17 @@ jobs:
 
     steps:
       - name: Checkout QMK Firmware
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
 
       - name: Download firmwares
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v4
         with:
           pattern: firmware-${{ inputs.keymap }}-*
           path: .
           merge-multiple: true
 
       - name: Upload all firmwares
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v4
         with:
           name: firmware-${{ inputs.keymap }}
           if-no-files-found: ignore
@@ -173,10 +172,10 @@ jobs:
             targets-${{ inputs.keymap }}
 
       - name: 'CI Discord Notification'
-        if: always() && !cancelled()
+        if: always()
         working-directory: util/ci/
         env:
           DISCORD_WEBHOOK: ${{ secrets.CI_DISCORD_WEBHOOK }}
         run: |
           python3 -m pip install -r requirements.txt
-          python3 ./discord-results.py --branch ${{ inputs.branch || github.ref_name }} --sha $(git rev-parse HEAD) --keymap ${{ inputs.keymap }} --url ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
+          python3 ./discord-results.py --branch ${{ inputs.branch || github.ref_name }} --keymap ${{ inputs.keymap }} --url ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}

.github/workflows/cli.yml

@@ -24,12 +24,11 @@ jobs:
     - name: Disable safe.directory check
       run : git config --global --add safe.directory '*'
 
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v4
       with:
         submodules: recursive
 
     - name: Install dependencies
       run: pip3 install -r requirements-dev.txt
-
     - name: Run tests
       run: qmk pytest

.github/workflows/develop_docs.yml

@@ -1,34 +0,0 @@
-name: Generate Develop Docs
-
-permissions:
-  contents: write
-
-on:
-  push:
-    branches:
-    - develop
-    paths:
-    - 'builddefs/docsgen/**'
-    - 'tmk_core/**'
-    - 'quantum/**'
-    - 'platforms/**'
-    - 'docs/**'
-    - '.github/workflows/docs.yml'
-
-jobs:
-  generate:
-    runs-on: ubuntu-latest
-
-    steps:
-    - name: Deploy Develop
-      if: ${{ github.repository == 'qmk/qmk_firmware' }}
-      uses: actions/github-script@v8
-      with:
-        github-token: ${{ secrets.QMK_BOT_TOKEN }}
-        script: |
-          const result = await github.rest.actions.createWorkflowDispatch({
-            owner: 'qmk',
-            repo: 'qmk_docs_devel',
-            workflow_id: 'develop.yml',
-            ref: 'main',
-          })

.github/workflows/develop_update.yml

@@ -15,7 +15,7 @@ jobs:
     if: github.repository == 'qmk/qmk_firmware'
 
     steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v4
       with:
         token: ${{ secrets.QMK_BOT_TOKEN }}
         fetch-depth: 0

.github/workflows/docs.yml

@@ -7,6 +7,7 @@ on:
   push:
     branches:
     - master
+    - vitepress
     paths:
     - 'builddefs/docsgen/**'
     - 'tmk_core/**'
@@ -14,11 +15,6 @@ on:
     - 'platforms/**'
     - 'docs/**'
     - '.github/workflows/docs.yml'
-  pull_request:
-    paths:
-    - 'builddefs/docsgen/**'
-    - 'docs/**'
-    - '.github/workflows/docs.yml'
 
 defaults:
   run:
@@ -29,18 +25,20 @@ jobs:
     runs-on: ubuntu-latest
     container: ghcr.io/qmk/qmk_cli
 
+    # protect against those who develop with their fork on master
+    if: github.repository == 'qmk/qmk_firmware' || (github.repository == 'tzarc/qmk_firmware' && github.ref == 'refs/heads/vitepress')
+
     steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v4
       with:
         fetch-depth: 1
 
     - name: Install dependencies
-      run: pip3 install -r requirements-dev.txt
-
-    - name: Install nvm
       run: |
+        apt-get update && apt-get install -y rsync doxygen curl
+        # install nvm
         touch $HOME/.bashrc
-        wget -qO- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.7/install.sh | bash
+        curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.7/install.sh | bash
 
     - name: Install node
       run: |
@@ -48,19 +46,40 @@ jobs:
         nvm install 20
         nvm use 20
         corepack enable
+        npm install -g moxygen
 
     - name: Build docs
       run: |
         source $HOME/.bashrc
         nvm use 20
         qmk --verbose generate-docs
+        touch '.build/docs/.nojekyll'
+
+    - name: Set CNAME
+      if: github.repository == 'qmk/qmk_firmware'
+      run: |
+        # Override target CNAME
+        echo 'docs.qmk.fm' > .build/docs/CNAME
+
+    - name: Override CNAME
+      if: github.repository == 'tzarc/qmk_firmware'
+      run: |
+        # Temporarily override target CNAME during development
+        echo 'vitepress.qmk.fm' > .build/docs/CNAME
 
     - name: Deploy
-      if: ${{ github.event_name == 'push' && github.repository == 'qmk/qmk_firmware' }}
-      uses: JamesIves/github-pages-deploy-action@v4.7.6
+      if: github.repository == 'qmk/qmk_firmware'
+      uses: JamesIves/github-pages-deploy-action@v4.6.1
       with:
           token: ${{ secrets.GITHUB_TOKEN }}
           branch: gh-pages
           folder: .build/docs
           git-config-name: QMK Bot
           git-config-email: hello@qmk.fm
+
+    - name: Deploy
+      if: github.repository == 'tzarc/qmk_firmware'
+      uses: JamesIves/github-pages-deploy-action@v4.6.1
+      with:
+        branch: gh-pages
+        folder: .build/docs

.github/workflows/feature_branch_update.yml

@@ -21,7 +21,7 @@ jobs:
         - riot
 
     steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v4
       with:
         token: ${{ secrets.QMK_BOT_TOKEN }}
         fetch-depth: 0

.github/workflows/format.yml

@@ -10,7 +10,6 @@ on:
     - 'lib/arm_atsam/**'
     - 'lib/lib8tion/**'
     - 'lib/python/**'
-    - 'modules/**'
     - 'platforms/**'
     - 'quantum/**'
     - 'tests/**'
@@ -26,7 +25,7 @@ jobs:
     - name: Disable safe.directory check
       run : git config --global --add safe.directory '*'
 
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v4
       with:
         fetch-depth: 0
 
@@ -36,7 +35,7 @@ jobs:
 
     - name: Get changed files
       id: file_changes
-      uses: tj-actions/changed-files@v47
+      uses: tj-actions/changed-files@v44
       with:
         use_rest_api: true
 

.github/workflows/format_push.yml

@@ -19,7 +19,7 @@ jobs:
     - name: Disable safe.directory check
       run : git config --global --add safe.directory '*'
 
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v4
       with:
         fetch-depth: 0
 
@@ -39,7 +39,7 @@ jobs:
         qmk format-text -a
         git diff
 
-    - uses: rlespinasse/github-slug-action@v5
+    - uses: rlespinasse/github-slug-action@v3.x
 
     - name: Become QMK Bot
       run: |
@@ -47,7 +47,7 @@ jobs:
         git config user.email 'hello@qmk.fm'
 
     - name: Create Pull Request
-      uses: peter-evans/create-pull-request@v8
+      uses: peter-evans/create-pull-request@v6
       if: ${{ github.repository == 'qmk/qmk_firmware'}}
       with:
         token: ${{ secrets.QMK_BOT_TOKEN }}

.github/workflows/labeler.yml

@@ -1,13 +1,18 @@
 name: "Pull Request Labeler"
 
+permissions:
+  contents: read
+  pull-requests: write
+
 on:
-- pull_request_target
+  pull_request_target:
+    types: [opened, synchronize, reopened, ready_for_review, locked]
 
 jobs:
   triage:
-    permissions:
-      contents: read
-      pull-requests: write
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/labeler@v6
+    - uses: actions/labeler@v4
+      with:
+        repo-token: "${{ secrets.GITHUB_TOKEN }}"
+        configuration-path: '.github/labeler.yml'

.github/workflows/lint.yml

@@ -18,7 +18,7 @@ jobs:
     - name: Disable safe.directory check
       run : git config --global --add safe.directory '*'
 
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v4
       with:
         fetch-depth: 0
 
@@ -27,7 +27,7 @@ jobs:
 
     - name: Get changed files
       id: file_changes
-      uses: tj-actions/changed-files@v47
+      uses: tj-actions/changed-files@v44
       with:
         use_rest_api: true
 

.github/workflows/regen.yml

@@ -19,10 +19,7 @@ jobs:
     - name: Disable safe.directory check
       run : git config --global --add safe.directory '*'
 
-    - uses: actions/checkout@v6
-
-    - name: Install dependencies
-      run: pip3 install -r requirements-dev.txt
+    - uses: actions/checkout@v4
 
     - name: Run qmk generators
       run: |

.github/workflows/regen_push.yml

@@ -19,17 +19,14 @@ jobs:
     - name: Disable safe.directory check
       run : git config --global --add safe.directory '*'
 
-    - uses: actions/checkout@v6
-
-    - name: Install dependencies
-      run: pip3 install -r requirements-dev.txt
+    - uses: actions/checkout@v4
 
     - name: Run qmk generators
       run: |
         util/regen.sh
         git diff
 
-    - uses: rlespinasse/github-slug-action@v5
+    - uses: rlespinasse/github-slug-action@v3.x
 
     - name: Become QMK Bot
       run: |
@@ -37,7 +34,7 @@ jobs:
         git config user.email 'hello@qmk.fm'
 
     - name: Create Pull Request
-      uses: peter-evans/create-pull-request@v8
+      uses: peter-evans/create-pull-request@v6
       if: ${{ github.repository == 'qmk/qmk_firmware'}}
       with:
         token: ${{ secrets.QMK_BOT_TOKEN }}

.github/workflows/stale.yml

@@ -45,7 +45,7 @@ jobs:
           stale-pr-label: stale
           days-before-pr-stale: 45
           days-before-pr-close: 30
-          exempt-pr-labels: bug,awaiting review,breaking_change,in progress,on hold,needs-core-wireless,crippled-firmware
+          exempt-pr-labels: bug,awaiting review,breaking_change,in progress,on hold
 
           stale-pr-message: >
             Thank you for your contribution!

.github/workflows/unit_test.yml

@@ -26,12 +26,10 @@ jobs:
     container: ghcr.io/qmk/qmk_cli
 
     steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v4
       with:
         submodules: recursive
-
     - name: Install dependencies
       run: pip3 install -r requirements-dev.txt
-
     - name: Run tests
       run: qmk test-c

.gitignore

@@ -25,8 +25,6 @@
 *.la
 *.stackdump
 *.sym
-index.html
-firmware_list.json
 
 # QMK-specific
 api_data/v1
@@ -64,9 +62,6 @@ build/
 cmake-build-debug
 CMakeLists.txt
 *.pdf
-*.zip
-.env
-.envrc
 
 # Let these ones be user specific, since we have so many different configurations
 *.code-workspace
@@ -97,11 +92,6 @@ tags
 *.mpeg
 *.ttf
 *.otf
-# Un-ignore limited image file formats in docs
-!docs/public/**.gif
-!docs/public/**.jpg
-!docs/public/**.jpeg
-!docs/public/**.png
 
 # Things Travis sees
 /.vs
@@ -126,5 +116,4 @@ compile_commands.json
 
 # VIA(L) files that don't belong in QMK repo
 via*.json
-/keyboards/**/keymaps/via/*
 /keyboards/**/keymaps/vial/*

.vscode/settings.json

@@ -10,13 +10,6 @@
         "**/*.uf2": true
     },
     "files.associations": {
-        // QMK Filetypes
-        "keyboard.json": "jsonc",
-        "info.json": "jsonc",
-        "keymap.json": "jsonc",
-        "qmk.json": "jsonc",
-        "qmk_module.json": "jsonc",
-        // Standard filetypes
         "*.h": "c",
         "*.c": "c",
         "*.inc": "c",
@@ -35,23 +28,7 @@
     "[json]": {
         "editor.formatOnSave": false
     },
-    "clangd.arguments": ["--header-insertion=never"],
-    "json.schemas": [
-        {
-            "fileMatch": ["qmk.json"],
-            "url": "./data/schemas/user_repo_v1_1.jsonschema"
-        },
-        {
-            "fileMatch": ["qmk_module.json"],
-            "url": "./data/schemas/community_module.jsonschema"
-        },
-        {
-            "fileMatch": ["keyboard.json", "info.json"],
-            "url": "./data/schemas/keyboard.jsonschema"
-        },
-        {
-            "fileMatch": ["keymap.json"],
-            "url": "./data/schemas/keymap.jsonschema"
-        }
+    "clangd.arguments": [
+        "--header-insertion=never"
     ]
 }

Doxyfile

@@ -145,7 +145,7 @@ FILE_PATTERNS          = *.c \
 RECURSIVE              = YES
 EXCLUDE                =
 EXCLUDE_SYMLINKS       = NO
-EXCLUDE_PATTERNS       =
+EXCLUDE_PATTERNS       = */protocol/arm_atsam/*
 EXCLUDE_SYMBOLS        =
 EXAMPLE_PATH           =
 EXAMPLE_PATTERNS       = *

Makefile

@@ -59,7 +59,6 @@ ifeq ($(ROOT_DIR),)
 endif
 
 include paths.mk
-include $(BUILDDEFS_PATH)/support.mk
 
 TEST_OUTPUT_DIR := $(BUILD_DIR)/test
 ERROR_FILE := $(BUILD_DIR)/error_occurred
@@ -114,29 +113,6 @@ endef
 # Make it easier to call TRY_TO_MATCH_RULE_FROM_LIST
 TRY_TO_MATCH_RULE_FROM_LIST = $(eval $(call TRY_TO_MATCH_RULE_FROM_LIST_HELPER,$1))$(RULE_FOUND)
 
-# As TRY_TO_MATCH_RULE_FROM_LIST_HELPER, but with additional
-# resolution of keyboard_aliases.hjson for provided rule 
-define TRY_TO_MATCH_RULE_FROM_LIST_HELPER_KB
-    # Split on ":", padding with empty strings to avoid indexing issues
-    TOKEN1:=$$(shell python3 -c "import sys; print((sys.argv[1].split(':',1)+[''])[0])" $$(RULE))
-    TOKENr:=$$(shell python3 -c "import sys; print((sys.argv[1].split(':',1)+[''])[1])" $$(RULE))
-
-    TOKEN1:=$$(shell $(QMK_BIN) resolve-alias --allow-unknown $$(TOKEN1))
-
-    FOUNDx:=$$(shell echo $1 | tr " " "\n" | grep -Fx $$(TOKEN1))
-    ifneq ($$(FOUNDx),)
-        RULE := $$(TOKENr)
-        RULE_FOUND := true
-        MATCHED_ITEM := $$(TOKEN1)
-    else
-        RULE_FOUND := false
-        MATCHED_ITEM :=
-    endif
-endef
-
-# Make it easier to call TRY_TO_MATCH_RULE_FROM_LIST_KB
-TRY_TO_MATCH_RULE_FROM_LIST_KB = $(eval $(call TRY_TO_MATCH_RULE_FROM_LIST_HELPER_KB,$1))$(RULE_FOUND)
-
 define ALL_IN_LIST_LOOP
     OLD_RULE$1 := $$(RULE)
     $$(eval $$(call $1,$$(ITEM$1)))
@@ -162,7 +138,7 @@ define PARSE_RULE
         $$(eval $$(call PARSE_TEST))
     # If the rule starts with the name of a known keyboard, then continue
     # the parsing from PARSE_KEYBOARD
-    else ifeq ($$(call TRY_TO_MATCH_RULE_FROM_LIST_KB,$$(shell $(QMK_BIN) list-keyboards)),true)
+    else ifeq ($$(call TRY_TO_MATCH_RULE_FROM_LIST,$$(shell $(QMK_BIN) list-keyboards --no-resolve-defaults)),true)
         KEYBOARD_RULE=$$(MATCHED_ITEM)
         $$(eval $$(call PARSE_KEYBOARD,$$(MATCHED_ITEM)))
     else
@@ -194,6 +170,17 @@ define PARSE_KEYBOARD
     # include the correct makefile to determine the actual name of it
     CURRENT_KB := $1
 
+    # KEYBOARD_FOLDERS := $$(subst /, , $(CURRENT_KB))
+
+    DEFAULT_FOLDER := $$(CURRENT_KB)
+
+    # We assume that every rules.mk will contain the full default value
+    $$(eval include $(ROOT_DIR)/keyboards/$$(CURRENT_KB)/rules.mk)
+    ifneq ($$(DEFAULT_FOLDER),$$(CURRENT_KB))
+        $$(eval include $(ROOT_DIR)/keyboards/$$(DEFAULT_FOLDER)/rules.mk)
+    endif
+    CURRENT_KB := $$(DEFAULT_FOLDER)
+
     # 5/4/3/2/1
     KEYBOARD_FOLDER_PATH_1 := $$(CURRENT_KB)
     KEYBOARD_FOLDER_PATH_2 := $$(patsubst %/,%,$$(dir $$(KEYBOARD_FOLDER_PATH_1)))
@@ -255,7 +242,7 @@ endef
 # if we are going to compile all keyboards, match the rest of the rule
 # for each of them
 define PARSE_ALL_KEYBOARDS
-    $$(eval $$(call PARSE_ALL_IN_LIST,PARSE_KEYBOARD,$(shell $(QMK_BIN) list-keyboards)))
+    $$(eval $$(call PARSE_ALL_IN_LIST,PARSE_KEYBOARD,$(shell $(QMK_BIN) list-keyboards --no-resolve-defaults)))
 endef
 
 # Prints a list of all known keymaps for the given keyboard
@@ -447,7 +434,7 @@ git-submodules: git-submodule
 
 .PHONY: list-keyboards
 list-keyboards:
-	$(QMK_BIN) list-keyboards | tr '\n' ' '
+	$(QMK_BIN) list-keyboards --no-resolve-defaults | tr '\n' ' '
 
 .PHONY: list-tests
 list-tests:
@@ -455,7 +442,7 @@ list-tests:
 
 .PHONY: generate-keyboards-file
 generate-keyboards-file:
-	$(QMK_BIN) list-keyboards
+	$(QMK_BIN) list-keyboards --no-resolve-defaults
 
 .PHONY: clean
 clean:
@@ -478,18 +465,3 @@ distclean_userspace: clean
 	rm -f $(QMK_USERSPACE)/*.bin $(QMK_USERSPACE)/*.hex $(QMK_USERSPACE)/*.uf2
 	echo 'done.'
 endif
-
-# Extra targets for formatting and/or pytest, running within the qmk/qmk_cli container to match GHA.
-CONTAINER_PREAMBLE := export HOME="/tmp"; export PATH="/tmp/.local/bin:\$$PATH"; python3 -m pip install --upgrade pip; python3 -m pip install -r requirements-dev.txt
-
-.PHONY: format-core
-format-core:
-	RUNTIME=docker ./util/docker_cmd.sh bash -lic "$(CONTAINER_PREAMBLE); qmk format-c --core-only -a && qmk format-python -a"
-
-.PHONY: pytest
-pytest:
-	RUNTIME=docker ./util/docker_cmd.sh bash -lic "$(CONTAINER_PREAMBLE); qmk pytest"
-
-.PHONY: format-and-pytest
-format-and-pytest:
-	RUNTIME=docker ./util/docker_cmd.sh bash -lic "$(CONTAINER_PREAMBLE); qmk format-c --core-only -a && qmk format-python -a && qmk pytest"

builddefs/build_full_test.mk

@@ -21,10 +21,10 @@ $(TEST_OUTPUT)_SRC := \
 	$(SRC) \
 	$(QUANTUM_PATH)/keymap_introspection.c \
 	tests/test_common/matrix.c \
-	tests/test_common/pointing_device_driver.c \
 	tests/test_common/test_driver.cpp \
 	tests/test_common/keyboard_report_util.cpp \
-	tests/test_common/mouse_report_util.cpp \
+	tests/test_common/keycode_util.cpp \
+	tests/test_common/keycode_table.cpp \
 	tests/test_common/test_fixture.cpp \
 	tests/test_common/test_keymap_key.cpp \
 	tests/test_common/test_logger.cpp \

builddefs/build_json.mk

@@ -19,18 +19,18 @@ endif
 ifneq ($(QMK_USERSPACE),)
     ifneq ("$(wildcard $(QMK_USERSPACE)/$(MAIN_KEYMAP_PATH_5)/keymap.json)","")
         KEYMAP_JSON := $(QMK_USERSPACE)/$(MAIN_KEYMAP_PATH_5)/keymap.json
-        KEYMAP_JSON_PATH := $(QMK_USERSPACE)/$(MAIN_KEYMAP_PATH_5)
+        KEYMAP_PATH := $(QMK_USERSPACE)/$(MAIN_KEYMAP_PATH_5)
     else ifneq ("$(wildcard $(QMK_USERSPACE)/$(MAIN_KEYMAP_PATH_4)/keymap.json)","")
         KEYMAP_JSON := $(QMK_USERSPACE)/$(MAIN_KEYMAP_PATH_4)/keymap.json
-        KEYMAP_JSON_PATH := $(QMK_USERSPACE)/$(MAIN_KEYMAP_PATH_4)
+        KEYMAP_PATH := $(QMK_USERSPACE)/$(MAIN_KEYMAP_PATH_4)
     else ifneq ("$(wildcard $(QMK_USERSPACE)/$(MAIN_KEYMAP_PATH_3)/keymap.json)","")
         KEYMAP_JSON := $(QMK_USERSPACE)/$(MAIN_KEYMAP_PATH_3)/keymap.json
-        KEYMAP_JSON_PATH := $(QMK_USERSPACE)/$(MAIN_KEYMAP_PATH_3)
+        KEYMAP_PATH := $(QMK_USERSPACE)/$(MAIN_KEYMAP_PATH_3)
     else ifneq ("$(wildcard $(QMK_USERSPACE)/$(MAIN_KEYMAP_PATH_2)/keymap.json)","")
         KEYMAP_JSON := $(QMK_USERSPACE)/$(MAIN_KEYMAP_PATH_2)/keymap.json
-        KEYMAP_JSON_PATH := $(QMK_USERSPACE)/$(MAIN_KEYMAP_PATH_2)
+        KEYMAP_PATH := $(QMK_USERSPACE)/$(MAIN_KEYMAP_PATH_2)
     else ifneq ("$(wildcard $(QMK_USERSPACE)/$(MAIN_KEYMAP_PATH_1)/keymap.json)","")
         KEYMAP_JSON := $(QMK_USERSPACE)/$(MAIN_KEYMAP_PATH_1)/keymap.json
-        KEYMAP_JSON_PATH := $(QMK_USERSPACE)/$(MAIN_KEYMAP_PATH_1)
+        KEYMAP_PATH := $(QMK_USERSPACE)/$(MAIN_KEYMAP_PATH_1)
     endif
 endif

builddefs/build_keyboard.mk

@@ -11,7 +11,6 @@ endif
 .DEFAULT_GOAL := all
 
 include paths.mk
-include $(BUILDDEFS_PATH)/support.mk
 include $(BUILDDEFS_PATH)/message.mk
 
 # Helper to add defines with a 'QMK_' prefix
@@ -35,13 +34,10 @@ ifeq ($(strip $(DUMP_CI_METADATA)),yes)
 endif
 
 # Force expansion
-override TARGET := $(TARGET)
+TARGET := $(TARGET)
 
 ifneq ($(FORCE_LAYOUT),)
-    override TARGET := $(TARGET)_$(FORCE_LAYOUT)
-endif
-ifneq ($(CONVERT_TO),)
-    override TARGET := $(TARGET)_$(CONVERT_TO)
+    TARGET := $(TARGET)_$(FORCE_LAYOUT)
 endif
 
 # Object files and generated keymap directory
@@ -62,6 +58,9 @@ ifdef SKIP_GIT
 VERSION_H_FLAGS += --skip-git
 endif
 
+# Generate the board's version.h file.
+$(shell $(QMK_BIN) generate-version-h $(VERSION_H_FLAGS) -q -o $(INTERMEDIATE_OUTPUT)/src/version.h)
+
 # Determine which subfolders exist.
 KEYBOARD_FOLDER_PATH_1 := $(KEYBOARD)
 KEYBOARD_FOLDER_PATH_2 := $(patsubst %/,%,$(dir $(KEYBOARD_FOLDER_PATH_1)))
@@ -98,44 +97,20 @@ endif
 
 
 # Pull in rules.mk files from all our subfolders
--include $(KEYBOARD_PATH_5)/rules.mk
--include $(KEYBOARD_PATH_4)/rules.mk
--include $(KEYBOARD_PATH_3)/rules.mk
--include $(KEYBOARD_PATH_2)/rules.mk
--include $(KEYBOARD_PATH_1)/rules.mk
-
-# Create dependencies on DD keyboard config - structure validated elsewhere
-DD_CONFIG_FILES :=
-ifneq ("$(wildcard $(KEYBOARD_PATH_1)/info.json)","")
-    DD_CONFIG_FILES += $(KEYBOARD_PATH_1)/info.json
+ifneq ("$(wildcard $(KEYBOARD_PATH_5)/rules.mk)","")
+    include $(KEYBOARD_PATH_5)/rules.mk
 endif
-ifneq ("$(wildcard $(KEYBOARD_PATH_2)/info.json)","")
-    DD_CONFIG_FILES += $(KEYBOARD_PATH_2)/info.json
+ifneq ("$(wildcard $(KEYBOARD_PATH_4)/rules.mk)","")
+    include $(KEYBOARD_PATH_4)/rules.mk
 endif
-ifneq ("$(wildcard $(KEYBOARD_PATH_3)/info.json)","")
-    DD_CONFIG_FILES += $(KEYBOARD_PATH_3)/info.json
+ifneq ("$(wildcard $(KEYBOARD_PATH_3)/rules.mk)","")
+    include $(KEYBOARD_PATH_3)/rules.mk
 endif
-ifneq ("$(wildcard $(KEYBOARD_PATH_4)/info.json)","")
-    DD_CONFIG_FILES += $(KEYBOARD_PATH_4)/info.json
+ifneq ("$(wildcard $(KEYBOARD_PATH_2)/rules.mk)","")
+    include $(KEYBOARD_PATH_2)/rules.mk
 endif
-ifneq ("$(wildcard $(KEYBOARD_PATH_5)/info.json)","")
-    DD_CONFIG_FILES += $(KEYBOARD_PATH_5)/info.json
-endif
-
-ifneq ("$(wildcard $(KEYBOARD_PATH_1)/keyboard.json)","")
-    DD_CONFIG_FILES += $(KEYBOARD_PATH_1)/keyboard.json
-endif
-ifneq ("$(wildcard $(KEYBOARD_PATH_2)/keyboard.json)","")
-    DD_CONFIG_FILES += $(KEYBOARD_PATH_2)/keyboard.json
-endif
-ifneq ("$(wildcard $(KEYBOARD_PATH_3)/keyboard.json)","")
-    DD_CONFIG_FILES += $(KEYBOARD_PATH_3)/keyboard.json
-endif
-ifneq ("$(wildcard $(KEYBOARD_PATH_4)/keyboard.json)","")
-    DD_CONFIG_FILES += $(KEYBOARD_PATH_4)/keyboard.json
-endif
-ifneq ("$(wildcard $(KEYBOARD_PATH_5)/keyboard.json)","")
-    DD_CONFIG_FILES += $(KEYBOARD_PATH_5)/keyboard.json
+ifneq ("$(wildcard $(KEYBOARD_PATH_1)/rules.mk)","")
+    include $(KEYBOARD_PATH_1)/rules.mk
 endif
 
 MAIN_KEYMAP_PATH_1 := $(KEYBOARD_PATH_1)/keymaps/$(KEYMAP)
@@ -211,10 +186,7 @@ endif
 # Have we found a keymap.json?
 ifneq ("$(wildcard $(KEYMAP_JSON))", "")
     ifneq ("$(wildcard $(KEYMAP_C))", "")
-        # Allow a separately-found keymap.c next to keymap.json -- the keymap.c
-        # generator will include the other keymap.c in the process, if supplied.
-        OTHER_KEYMAP_C := $(KEYMAP_C)
-        OPT_DEFS += -DOTHER_KEYMAP_C=\"$(OTHER_KEYMAP_C)\"
+        $(call WARNING_MESSAGE,Keymap is specified as both keymap.json and keymap.c -- keymap.json file wins.)
     endif
 
     KEYMAP_PATH := $(KEYMAP_JSON_PATH)
@@ -222,82 +194,30 @@ ifneq ("$(wildcard $(KEYMAP_JSON))", "")
     KEYMAP_C := $(INTERMEDIATE_OUTPUT)/src/keymap.c
     KEYMAP_H := $(INTERMEDIATE_OUTPUT)/src/config.h
 
-    ifeq ($(OTHER_KEYMAP_C),)
-        # Load the keymap-level rules.mk if exists (and we havent already loaded it for keymap.c)
-        -include $(KEYMAP_PATH)/rules.mk
-    endif
+    # Load the keymap-level rules.mk if exists
+    -include $(KEYMAP_PATH)/rules.mk
 
     # Load any rules.mk content from keymap.json
     INFO_RULES_MK = $(shell $(QMK_BIN) generate-rules-mk --quiet --escape --output $(INTERMEDIATE_OUTPUT)/src/rules.mk $(KEYMAP_JSON))
     include $(INFO_RULES_MK)
 
 # Add rules to generate the keymap files - indentation here is important
-$(INTERMEDIATE_OUTPUT)/src/keymap.c: $(KEYMAP_JSON) $(DD_CONFIG_FILES)
+$(INTERMEDIATE_OUTPUT)/src/keymap.c: $(KEYMAP_JSON)
 	@$(SILENT) || printf "$(MSG_GENERATING) $@" | $(AWK_CMD)
 	$(eval CMD=$(QMK_BIN) json2c --quiet --output $(KEYMAP_C) $(KEYMAP_JSON))
 	@$(BUILD_CMD)
 
-$(INTERMEDIATE_OUTPUT)/src/config.h: $(KEYMAP_JSON) $(DD_CONFIG_FILES)
+$(INTERMEDIATE_OUTPUT)/src/config.h: $(KEYMAP_JSON)
 	@$(SILENT) || printf "$(MSG_GENERATING) $@" | $(AWK_CMD)
 	$(eval CMD=$(QMK_BIN) generate-config-h --quiet --output $(KEYMAP_H) $(KEYMAP_JSON))
 	@$(BUILD_CMD)
 
-$(INTERMEDIATE_OUTPUT)/src/keymap.h: $(KEYMAP_JSON) $(DD_CONFIG_FILES)
-	@$(SILENT) || printf "$(MSG_GENERATING) $@" | $(AWK_CMD)
-	$(eval CMD=$(QMK_BIN) generate-keymap-h --quiet --output $(INTERMEDIATE_OUTPUT)/src/keymap.h $(KEYMAP_JSON))
-	@$(BUILD_CMD)
-
-generated-files: $(INTERMEDIATE_OUTPUT)/src/config.h $(INTERMEDIATE_OUTPUT)/src/keymap.c $(INTERMEDIATE_OUTPUT)/src/keymap.h
-
-endif
-
-# Community modules
-COMMUNITY_RULES_MK = $(shell $(QMK_BIN) generate-community-modules-rules-mk -kb $(KEYBOARD) --quiet --escape --output $(INTERMEDIATE_OUTPUT)/src/community_rules.mk $(KEYMAP_JSON))
-include $(COMMUNITY_RULES_MK)
-
-ifneq ($(COMMUNITY_MODULES),)
-
-$(INTERMEDIATE_OUTPUT)/src/community_modules.h: $(KEYMAP_JSON) $(DD_CONFIG_FILES)
-	@$(SILENT) || printf "$(MSG_GENERATING) $@" | $(AWK_CMD)
-	$(eval CMD=$(QMK_BIN) generate-community-modules-h -kb $(KEYBOARD) --quiet --output $(INTERMEDIATE_OUTPUT)/src/community_modules.h $(KEYMAP_JSON))
-	@$(BUILD_CMD)
-
-$(INTERMEDIATE_OUTPUT)/src/community_modules.c: $(KEYMAP_JSON) $(DD_CONFIG_FILES)
-	@$(SILENT) || printf "$(MSG_GENERATING) $@" | $(AWK_CMD)
-	$(eval CMD=$(QMK_BIN) generate-community-modules-c -kb $(KEYBOARD) --quiet --output $(INTERMEDIATE_OUTPUT)/src/community_modules.c $(KEYMAP_JSON))
-	@$(BUILD_CMD)
-
-$(INTERMEDIATE_OUTPUT)/src/community_modules_introspection.c: $(KEYMAP_JSON) $(DD_CONFIG_FILES)
-	@$(SILENT) || printf "$(MSG_GENERATING) $@" | $(AWK_CMD)
-	$(eval CMD=$(QMK_BIN) generate-community-modules-introspection-c -kb $(KEYBOARD) --quiet --output $(INTERMEDIATE_OUTPUT)/src/community_modules_introspection.c $(KEYMAP_JSON))
-	@$(BUILD_CMD)
-
-$(INTERMEDIATE_OUTPUT)/src/community_modules_introspection.h: $(KEYMAP_JSON) $(DD_CONFIG_FILES)
-	@$(SILENT) || printf "$(MSG_GENERATING) $@" | $(AWK_CMD)
-	$(eval CMD=$(QMK_BIN) generate-community-modules-introspection-h -kb $(KEYBOARD) --quiet --output $(INTERMEDIATE_OUTPUT)/src/community_modules_introspection.h $(KEYMAP_JSON))
-	@$(BUILD_CMD)
-
-$(INTERMEDIATE_OUTPUT)/src/led_matrix_community_modules.inc: $(KEYMAP_JSON) $(DD_CONFIG_FILES)
-	@$(SILENT) || printf "$(MSG_GENERATING) $@" | $(AWK_CMD)
-	$(eval CMD=$(QMK_BIN) generate-led-matrix-community-modules-inc -kb $(KEYBOARD) --quiet --output $(INTERMEDIATE_OUTPUT)/src/led_matrix_community_modules.inc $(KEYMAP_JSON))
-	@$(BUILD_CMD)
-
-$(INTERMEDIATE_OUTPUT)/src/rgb_matrix_community_modules.inc: $(KEYMAP_JSON) $(DD_CONFIG_FILES)
-	@$(SILENT) || printf "$(MSG_GENERATING) $@" | $(AWK_CMD)
-	$(eval CMD=$(QMK_BIN) generate-rgb-matrix-community-modules-inc -kb $(KEYBOARD) --quiet --output $(INTERMEDIATE_OUTPUT)/src/rgb_matrix_community_modules.inc $(KEYMAP_JSON))
-	@$(BUILD_CMD)
-
-SRC += $(INTERMEDIATE_OUTPUT)/src/community_modules.c
-
-generated-files: $(INTERMEDIATE_OUTPUT)/src/community_modules.h $(INTERMEDIATE_OUTPUT)/src/community_modules.c $(INTERMEDIATE_OUTPUT)/src/community_modules_introspection.c $(INTERMEDIATE_OUTPUT)/src/community_modules_introspection.h $(INTERMEDIATE_OUTPUT)/src/led_matrix_community_modules.inc $(INTERMEDIATE_OUTPUT)/src/rgb_matrix_community_modules.inc
+generated-files: $(INTERMEDIATE_OUTPUT)/src/config.h $(INTERMEDIATE_OUTPUT)/src/keymap.c
 
 endif
 
 include $(BUILDDEFS_PATH)/converters.mk
 
-# Generate the board's version.h file.
-$(shell $(QMK_BIN) generate-version-h $(VERSION_H_FLAGS) -q -o $(INTERMEDIATE_OUTPUT)/src/version.h)
-
 MCU_ORIG := $(MCU)
 include $(wildcard $(PLATFORM_PATH)/*/mcu_selection.mk)
 
@@ -382,14 +302,6 @@ endif
 
 # Find all of the config.h files and add them to our CONFIG_H define.
 CONFIG_H :=
-
-define config_h_community_module_appender
-	ifneq ("$(wildcard $(1)/config.h)","")
-		CONFIG_H += $(1)/config.h
-	endif
-endef
-$(foreach module,$(COMMUNITY_MODULE_PATHS),$(eval $(call config_h_community_module_appender,$(module))))
-
 ifneq ("$(wildcard $(KEYBOARD_PATH_5)/config.h)","")
     CONFIG_H += $(KEYBOARD_PATH_5)/config.h
 endif
@@ -407,14 +319,6 @@ ifneq ("$(wildcard $(KEYBOARD_PATH_1)/config.h)","")
 endif
 
 POST_CONFIG_H :=
-
-define post_config_h_community_module_appender
-	ifneq ("$(wildcard $(1)/post_config.h)","")
-		POST_CONFIG_H += $(1)/post_config.h
-	endif
-endef
-$(foreach module,$(COMMUNITY_MODULE_PATHS),$(eval $(call post_config_h_community_module_appender,$(module))))
-
 ifneq ("$(wildcard $(KEYBOARD_PATH_1)/post_config.h)","")
     POST_CONFIG_H += $(KEYBOARD_PATH_1)/post_config.h
 endif
@@ -431,6 +335,40 @@ ifneq ("$(wildcard $(KEYBOARD_PATH_5)/post_config.h)","")
     POST_CONFIG_H += $(KEYBOARD_PATH_5)/post_config.h
 endif
 
+# Create dependencies on DD keyboard config - structure validated elsewhere
+DD_CONFIG_FILES :=
+ifneq ("$(wildcard $(KEYBOARD_PATH_1)/info.json)","")
+    DD_CONFIG_FILES += $(KEYBOARD_PATH_1)/info.json
+endif
+ifneq ("$(wildcard $(KEYBOARD_PATH_2)/info.json)","")
+    DD_CONFIG_FILES += $(KEYBOARD_PATH_2)/info.json
+endif
+ifneq ("$(wildcard $(KEYBOARD_PATH_3)/info.json)","")
+    DD_CONFIG_FILES += $(KEYBOARD_PATH_3)/info.json
+endif
+ifneq ("$(wildcard $(KEYBOARD_PATH_4)/info.json)","")
+    DD_CONFIG_FILES += $(KEYBOARD_PATH_4)/info.json
+endif
+ifneq ("$(wildcard $(KEYBOARD_PATH_5)/info.json)","")
+    DD_CONFIG_FILES += $(KEYBOARD_PATH_5)/info.json
+endif
+
+ifneq ("$(wildcard $(KEYBOARD_PATH_1)/keyboard.json)","")
+    DD_CONFIG_FILES += $(KEYBOARD_PATH_1)/keyboard.json
+endif
+ifneq ("$(wildcard $(KEYBOARD_PATH_2)/keyboard.json)","")
+    DD_CONFIG_FILES += $(KEYBOARD_PATH_2)/keyboard.json
+endif
+ifneq ("$(wildcard $(KEYBOARD_PATH_3)/keyboard.json)","")
+    DD_CONFIG_FILES += $(KEYBOARD_PATH_3)/keyboard.json
+endif
+ifneq ("$(wildcard $(KEYBOARD_PATH_4)/keyboard.json)","")
+    DD_CONFIG_FILES += $(KEYBOARD_PATH_4)/keyboard.json
+endif
+ifneq ("$(wildcard $(KEYBOARD_PATH_5)/keyboard.json)","")
+    DD_CONFIG_FILES += $(KEYBOARD_PATH_5)/keyboard.json
+endif
+
 CONFIG_H += $(INTERMEDIATE_OUTPUT)/src/info_config.h
 KEYBOARD_SRC += $(INTERMEDIATE_OUTPUT)/src/default_keyboard.c
 
@@ -474,10 +412,8 @@ ifneq ($(wildcard $(QMK_USERSPACE)),)
 endif
 
 # If the equivalent users directory exists in userspace, use that in preference to anything currently in the main repo
-ifneq ($(QMK_USERSPACE),)
-	ifneq ($(wildcard $(QMK_USERSPACE)/$(USER_PATH)),)
-    	USER_PATH := $(QMK_USERSPACE)/$(USER_PATH)
-	endif
+ifneq ($(wildcard $(QMK_USERSPACE)/$(USER_PATH)),)
+    USER_PATH := $(QMK_USERSPACE)/$(USER_PATH)
 endif
 
 # Pull in user level rules.mk
@@ -497,18 +433,21 @@ ifneq ("$(CONVERTER)","")
 endif
 
 # Pull in post_rules.mk files from all our subfolders
--include $(KEYBOARD_PATH_1)/post_rules.mk
--include $(KEYBOARD_PATH_2)/post_rules.mk
--include $(KEYBOARD_PATH_3)/post_rules.mk
--include $(KEYBOARD_PATH_4)/post_rules.mk
--include $(KEYBOARD_PATH_5)/post_rules.mk
-
-define post_rules_mk_community_module_includer
-	ifneq ("$(wildcard $(1)/post_rules.mk)","")
-		include $(1)/post_rules.mk
-	endif
-endef
-$(foreach module,$(COMMUNITY_MODULE_PATHS),$(eval $(call post_rules_mk_community_module_includer,$(module))))
+ifneq ("$(wildcard $(KEYBOARD_PATH_1)/post_rules.mk)","")
+    include $(KEYBOARD_PATH_1)/post_rules.mk
+endif
+ifneq ("$(wildcard $(KEYBOARD_PATH_2)/post_rules.mk)","")
+    include $(KEYBOARD_PATH_2)/post_rules.mk
+endif
+ifneq ("$(wildcard $(KEYBOARD_PATH_3)/post_rules.mk)","")
+    include $(KEYBOARD_PATH_3)/post_rules.mk
+endif
+ifneq ("$(wildcard $(KEYBOARD_PATH_4)/post_rules.mk)","")
+    include $(KEYBOARD_PATH_4)/post_rules.mk
+endif
+ifneq ("$(wildcard $(KEYBOARD_PATH_5)/post_rules.mk)","")
+    include $(KEYBOARD_PATH_5)/post_rules.mk
+endif
 
 ifneq ("$(wildcard $(KEYMAP_PATH)/config.h)","")
     CONFIG_H += $(KEYMAP_PATH)/config.h

builddefs/build_layout.mk

@@ -10,10 +10,10 @@ define SEARCH_LAYOUTS_REPO
     LAYOUT_KEYMAP_JSON := $$(LAYOUT_KEYMAP_PATH)/keymap.json
     LAYOUT_KEYMAP_C := $$(LAYOUT_KEYMAP_PATH)/keymap.c
     ifneq ("$$(wildcard $$(LAYOUT_KEYMAP_JSON))","")
+        -include $$(LAYOUT_KEYMAP_PATH)/rules.mk
         KEYMAP_JSON := $$(LAYOUT_KEYMAP_JSON)
-        KEYMAP_JSON_PATH := $$(LAYOUT_KEYMAP_PATH)
-    endif
-    ifneq ("$$(wildcard $$(LAYOUT_KEYMAP_C))","")
+        KEYMAP_PATH := $$(LAYOUT_KEYMAP_PATH)
+    else ifneq ("$$(wildcard $$(LAYOUT_KEYMAP_C))","")
         -include $$(LAYOUT_KEYMAP_PATH)/rules.mk
         KEYMAP_C := $$(LAYOUT_KEYMAP_C)
         KEYMAP_PATH := $$(LAYOUT_KEYMAP_PATH)

builddefs/build_test.mk

@@ -7,7 +7,6 @@ endif
 OPT = g
 
 include paths.mk
-include $(BUILDDEFS_PATH)/support.mk
 include $(BUILDDEFS_PATH)/message.mk
 
 TARGET=test/$(TEST_OUTPUT)
@@ -48,8 +47,7 @@ PLATFORM:=TEST
 PLATFORM_KEY:=test
 BOOTLOADER_TYPE:=none
 
-DEBUG ?= 0
-ifneq ($(strip $(DEBUG)), 0)
+ifeq ($(strip $(DEBUG)), 1)
 CONSOLE_ENABLE = yes
 endif
 
@@ -62,7 +60,6 @@ include $(BUILDDEFS_PATH)/common_features.mk
 include $(BUILDDEFS_PATH)/generic_features.mk
 include $(PLATFORM_PATH)/common.mk
 include $(TMK_PATH)/protocol.mk
-include $(QUANTUM_PATH)/battery/tests/rules.mk
 include $(QUANTUM_PATH)/debounce/tests/rules.mk
 include $(QUANTUM_PATH)/encoder/tests/rules.mk
 include $(QUANTUM_PATH)/os_detection/tests/rules.mk

builddefs/common_features.mk

@@ -28,11 +28,6 @@ QUANTUM_SRC += \
     $(QUANTUM_DIR)/sync_timer.c \
     $(QUANTUM_DIR)/logging/debug.c \
     $(QUANTUM_DIR)/logging/sendchar.c \
-    $(QUANTUM_DIR)/process_keycode/process_default_layer.c \
-    $(QUANTUM_DIR)/process_keycode/process_oneshot.c \
-    $(QUANTUM_DIR)/process_keycode/process_quantum.c \
-
-include $(QUANTUM_DIR)/nvm/rules.mk
 
 VPATH += $(QUANTUM_DIR)/logging
 # Fall back to lib/printf if there is no platform provided print
@@ -125,7 +120,7 @@ ifeq ($(strip $(MOUSEKEY_ENABLE)), yes)
     MOUSE_ENABLE := yes
 endif
 
-VALID_POINTING_DEVICE_DRIVER_TYPES := adns5050 adns9800 analog_joystick azoteq_iqs5xx cirque_pinnacle_i2c cirque_pinnacle_spi paw3204 paw3222 pmw3320 pmw3360 pmw3389 pimoroni_trackball custom
+VALID_POINTING_DEVICE_DRIVER_TYPES := adns5050 adns9800 analog_joystick azoteq_iqs5xx cirque_pinnacle_i2c cirque_pinnacle_spi paw3204 pmw3320 pmw3360 pmw3389 pimoroni_trackball custom
 ifeq ($(strip $(POINTING_DEVICE_ENABLE)), yes)
     ifeq ($(filter $(POINTING_DEVICE_DRIVER),$(VALID_POINTING_DEVICE_DRIVER_TYPES)),)
         $(call CATASTROPHIC_ERROR,Invalid POINTING_DEVICE_DRIVER,POINTING_DEVICE_DRIVER="$(POINTING_DEVICE_DRIVER)" is not a valid pointing device type)
@@ -134,13 +129,13 @@ ifeq ($(strip $(POINTING_DEVICE_ENABLE)), yes)
         MOUSE_ENABLE := yes
         VPATH += $(QUANTUM_DIR)/pointing_device
         SRC += $(QUANTUM_DIR)/pointing_device/pointing_device.c
+        SRC += $(QUANTUM_DIR)/pointing_device/pointing_device_drivers.c
         SRC += $(QUANTUM_DIR)/pointing_device/pointing_device_auto_mouse.c
         ifneq ($(strip $(POINTING_DEVICE_DRIVER)), custom)
             SRC += drivers/sensors/$(strip $(POINTING_DEVICE_DRIVER)).c
             OPT_DEFS += -DPOINTING_DEVICE_DRIVER_$(strip $(shell echo $(POINTING_DEVICE_DRIVER) | tr '[:lower:]' '[:upper:]'))
         endif
         OPT_DEFS += -DPOINTING_DEVICE_DRIVER_$(strip $(POINTING_DEVICE_DRIVER))
-        OPT_DEFS += -DPOINTING_DEVICE_DRIVER_NAME=$(strip $(POINTING_DEVICE_DRIVER))
         ifeq ($(strip $(POINTING_DEVICE_DRIVER)), adns9800)
             SPI_DRIVER_REQUIRED = yes
         else ifeq ($(strip $(POINTING_DEVICE_DRIVER)), analog_joystick)
@@ -157,8 +152,6 @@ ifeq ($(strip $(POINTING_DEVICE_ENABLE)), yes)
             SRC += drivers/sensors/cirque_pinnacle.c
             SRC += drivers/sensors/cirque_pinnacle_gestures.c
             SRC += $(QUANTUM_DIR)/pointing_device/pointing_device_gestures.c
-        else ifeq ($(strip $(POINTING_DEVICE_DRIVER)), paw3222)
-            SPI_DRIVER_REQUIRED = yes
         else ifeq ($(strip $(POINTING_DEVICE_DRIVER)), pimoroni_trackball)
             I2C_DRIVER_REQUIRED = yes
         else ifneq ($(filter $(strip $(POINTING_DEVICE_DRIVER)),pmw3360 pmw3389),)
@@ -175,82 +168,84 @@ endif
 
 VALID_EEPROM_DRIVER_TYPES := vendor custom transient i2c spi wear_leveling legacy_stm32_flash
 EEPROM_DRIVER ?= vendor
-ifneq ($(strip $(EEPROM_DRIVER)),none)
-  ifeq ($(filter $(EEPROM_DRIVER),$(VALID_EEPROM_DRIVER_TYPES)),)
+ifeq ($(filter $(EEPROM_DRIVER),$(VALID_EEPROM_DRIVER_TYPES)),)
   $(call CATASTROPHIC_ERROR,Invalid EEPROM_DRIVER,EEPROM_DRIVER="$(EEPROM_DRIVER)" is not a valid EEPROM driver)
-  else
-    OPT_DEFS += -DEEPROM_ENABLE
-    COMMON_VPATH += $(PLATFORM_PATH)/$(PLATFORM_KEY)/$(DRIVER_DIR)/eeprom
-    COMMON_VPATH += $(DRIVER_PATH)/eeprom
-    COMMON_VPATH += $(PLATFORM_COMMON_DIR)
-    ifeq ($(strip $(EEPROM_DRIVER)), custom)
-      # Custom EEPROM implementation -- only needs to implement init/erase/read_block/write_block
-      OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_CUSTOM
-      SRC += eeprom_driver.c
-    else ifeq ($(strip $(EEPROM_DRIVER)), wear_leveling)
-      # Wear-leveling EEPROM implementation
-      OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_WEAR_LEVELING
-      SRC += eeprom_driver.c eeprom_wear_leveling.c
-    else ifeq ($(strip $(EEPROM_DRIVER)), i2c)
-      # External I2C EEPROM implementation
-      OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_I2C
-      I2C_DRIVER_REQUIRED = yes
-      SRC += eeprom_driver.c eeprom_i2c.c
-    else ifeq ($(strip $(EEPROM_DRIVER)), spi)
-      # External SPI EEPROM implementation
-      OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_SPI
-      SPI_DRIVER_REQUIRED = yes
-      SRC += eeprom_driver.c eeprom_spi.c
-    else ifeq ($(strip $(EEPROM_DRIVER)), legacy_stm32_flash)
-      # STM32 Emulated EEPROM, backed by MCU flash (soon to be deprecated)
-      OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_LEGACY_EMULATED_FLASH
-      COMMON_VPATH += $(PLATFORM_PATH)/$(PLATFORM_KEY)/$(DRIVER_DIR)/flash
-      COMMON_VPATH += $(DRIVER_PATH)/flash
-      SRC += eeprom_driver.c eeprom_legacy_emulated_flash.c legacy_flash_ops.c
-    else ifeq ($(strip $(EEPROM_DRIVER)), transient)
-      # Transient EEPROM implementation -- no data storage but provides runtime area for it
-      OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_TRANSIENT
-      SRC += eeprom_driver.c eeprom_transient.c
-    else ifeq ($(strip $(EEPROM_DRIVER)), vendor)
-      # Vendor-implemented EEPROM
-      OPT_DEFS += -DEEPROM_VENDOR
-      ifeq ($(PLATFORM),AVR)
-        # Automatically provided by avr-libc, nothing required
-      else ifeq ($(PLATFORM),CHIBIOS)
-        ifneq ($(filter %_STM32F072xB %_STM32F042x6, $(MCU_SERIES)_$(MCU_LDSCRIPT)),)
-          # STM32 Emulated EEPROM, backed by MCU flash (soon to be deprecated)
-          OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_LEGACY_EMULATED_FLASH
-          COMMON_VPATH += $(PLATFORM_PATH)/$(PLATFORM_KEY)/$(DRIVER_DIR)/flash
-          COMMON_VPATH += $(DRIVER_PATH)/flash
-          SRC += eeprom_driver.c eeprom_legacy_emulated_flash.c legacy_flash_ops.c
-        else ifneq ($(filter $(MCU_SERIES),STM32F1xx STM32F3xx STM32F4xx STM32L4xx STM32G0xx STM32G4xx WB32F3G71xx WB32FQ95xx AT32F415 GD32VF103),)
-          # Wear-leveling EEPROM implementation, backed by MCU flash
-          OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_WEAR_LEVELING
-          SRC += eeprom_driver.c eeprom_wear_leveling.c
-          WEAR_LEVELING_DRIVER ?= embedded_flash
-        else ifneq ($(filter $(MCU_SERIES),STM32L0xx STM32L1xx),)
-          # True EEPROM on STM32L0xx, L1xx
-          OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_STM32_L0_L1
-          SRC += eeprom_driver.c eeprom_stm32_L0_L1.c
-        else ifneq ($(filter $(MCU_SERIES),RP2040),)
-          # Wear-leveling EEPROM implementation, backed by RP2040 flash
-          OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_WEAR_LEVELING
-          SRC += eeprom_driver.c eeprom_wear_leveling.c
-          WEAR_LEVELING_DRIVER ?= rp2040_flash
-        else ifneq ($(filter $(MCU_SERIES),KL2x K20x),)
-          # Teensy EEPROM implementations
-          OPT_DEFS += -DEEPROM_KINETIS_FLEXRAM
-          SRC += eeprom_kinetis_flexram.c
-        else
-          # Fall back to transient, i.e. non-persistent
-          OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_TRANSIENT
-          SRC += eeprom_driver.c eeprom_transient.c
-        endif
-      else ifeq ($(PLATFORM),TEST)
-        # Test harness "EEPROM"
-        OPT_DEFS += -DEEPROM_TEST_HARNESS
-        SRC += eeprom.c
+else
+  OPT_DEFS += -DEEPROM_ENABLE
+  COMMON_VPATH += $(PLATFORM_PATH)/$(PLATFORM_KEY)/$(DRIVER_DIR)/eeprom
+  COMMON_VPATH += $(DRIVER_PATH)/eeprom
+  COMMON_VPATH += $(PLATFORM_COMMON_DIR)
+  ifeq ($(strip $(EEPROM_DRIVER)), custom)
+    # Custom EEPROM implementation -- only needs to implement init/erase/read_block/write_block
+    OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_CUSTOM
+    SRC += eeprom_driver.c
+  else ifeq ($(strip $(EEPROM_DRIVER)), wear_leveling)
+    # Wear-leveling EEPROM implementation
+    OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_WEAR_LEVELING
+    SRC += eeprom_driver.c eeprom_wear_leveling.c
+  else ifeq ($(strip $(EEPROM_DRIVER)), i2c)
+    # External I2C EEPROM implementation
+    OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_I2C
+    I2C_DRIVER_REQUIRED = yes
+    SRC += eeprom_driver.c eeprom_i2c.c
+  else ifeq ($(strip $(EEPROM_DRIVER)), spi)
+    # External SPI EEPROM implementation
+    OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_SPI
+    SPI_DRIVER_REQUIRED = yes
+    SRC += eeprom_driver.c eeprom_spi.c
+  else ifeq ($(strip $(EEPROM_DRIVER)), legacy_stm32_flash)
+    # STM32 Emulated EEPROM, backed by MCU flash (soon to be deprecated)
+    OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_LEGACY_EMULATED_FLASH
+    COMMON_VPATH += $(PLATFORM_PATH)/$(PLATFORM_KEY)/$(DRIVER_DIR)/flash
+    COMMON_VPATH += $(DRIVER_PATH)/flash
+    SRC += eeprom_driver.c eeprom_legacy_emulated_flash.c legacy_flash_ops.c
+  else ifeq ($(strip $(EEPROM_DRIVER)), transient)
+    # Transient EEPROM implementation -- no data storage but provides runtime area for it
+    OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_TRANSIENT
+    SRC += eeprom_driver.c eeprom_transient.c
+  else ifeq ($(strip $(EEPROM_DRIVER)), vendor)
+    # Vendor-implemented EEPROM
+    OPT_DEFS += -DEEPROM_VENDOR
+    ifeq ($(PLATFORM),AVR)
+      # Automatically provided by avr-libc, nothing required
+    else ifeq ($(PLATFORM),CHIBIOS)
+      ifneq ($(filter %_STM32F072xB %_STM32F042x6, $(MCU_SERIES)_$(MCU_LDSCRIPT)),)
+        # STM32 Emulated EEPROM, backed by MCU flash (soon to be deprecated)
+        OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_LEGACY_EMULATED_FLASH
+        COMMON_VPATH += $(PLATFORM_PATH)/$(PLATFORM_KEY)/$(DRIVER_DIR)/flash
+        COMMON_VPATH += $(DRIVER_PATH)/flash
+        SRC += eeprom_driver.c eeprom_legacy_emulated_flash.c legacy_flash_ops.c
+      else ifneq ($(filter $(MCU_SERIES),STM32F1xx STM32F3xx STM32F4xx STM32L4xx STM32G4xx WB32F3G71xx WB32FQ95xx GD32VF103),)
+        # Wear-leveling EEPROM implementation, backed by MCU flash
+        OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_WEAR_LEVELING
+        SRC += eeprom_driver.c eeprom_wear_leveling.c
+        WEAR_LEVELING_DRIVER ?= embedded_flash
+      else ifneq ($(filter $(MCU_SERIES),STM32L0xx STM32L1xx),)
+        # True EEPROM on STM32L0xx, L1xx
+        OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_STM32_L0_L1
+        SRC += eeprom_driver.c eeprom_stm32_L0_L1.c
+      else ifneq ($(filter $(MCU_SERIES),RP2040),)
+        # Wear-leveling EEPROM implementation, backed by RP2040 flash
+        OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_WEAR_LEVELING
+        SRC += eeprom_driver.c eeprom_wear_leveling.c
+        WEAR_LEVELING_DRIVER ?= rp2040_flash
+      else ifneq ($(filter $(MCU_SERIES),KL2x K20x),)
+        # Teensy EEPROM implementations
+        OPT_DEFS += -DEEPROM_KINETIS_FLEXRAM
+        SRC += eeprom_kinetis_flexram.c
+      else
+        # Fall back to transient, i.e. non-persistent
+        OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_TRANSIENT
+        SRC += eeprom_driver.c eeprom_transient.c
       endif
+    else ifeq ($(PLATFORM),ARM_ATSAM)
+      # arm_atsam EEPROM
+      OPT_DEFS += -DEEPROM_SAMD
+      SRC += eeprom_samd.c
+    else ifeq ($(PLATFORM),TEST)
+      # Test harness "EEPROM"
+      OPT_DEFS += -DEEPROM_TEST_HARNESS
+      SRC += eeprom.c
     endif
   endif
 endif
@@ -271,29 +266,34 @@ ifneq ($(strip $(WEAR_LEVELING_DRIVER)),none)
     ifeq ($(strip $(WEAR_LEVELING_DRIVER)), embedded_flash)
       OPT_DEFS += -DHAL_USE_EFL
       SRC += wear_leveling_efl.c
+      POST_CONFIG_H += $(PLATFORM_PATH)/$(PLATFORM_KEY)/$(DRIVER_DIR)/wear_leveling/wear_leveling_efl_config.h
     else ifeq ($(strip $(WEAR_LEVELING_DRIVER)), spi_flash)
       FLASH_DRIVER := spi
       SRC += wear_leveling_flash_spi.c
+      POST_CONFIG_H += $(DRIVER_PATH)/wear_leveling/wear_leveling_flash_spi_config.h
     else ifeq ($(strip $(WEAR_LEVELING_DRIVER)), rp2040_flash)
       SRC += wear_leveling_rp2040_flash.c
+      POST_CONFIG_H += $(PLATFORM_PATH)/$(PLATFORM_KEY)/$(DRIVER_PATH)/wear_leveling/wear_leveling_rp2040_flash_config.h
     else ifeq ($(strip $(WEAR_LEVELING_DRIVER)), legacy)
       COMMON_VPATH += $(PLATFORM_PATH)/$(PLATFORM_KEY)/$(DRIVER_DIR)/flash
       SRC += legacy_flash_ops.c wear_leveling_legacy.c
+      POST_CONFIG_H += $(PLATFORM_PATH)/$(PLATFORM_KEY)/$(DRIVER_DIR)/wear_leveling/wear_leveling_legacy_config.h
     endif
   endif
 endif
 
-VALID_FLASH_DRIVER_TYPES := spi custom
+VALID_FLASH_DRIVER_TYPES := spi
 FLASH_DRIVER ?= none
 ifneq ($(strip $(FLASH_DRIVER)), none)
     ifeq ($(filter $(FLASH_DRIVER),$(VALID_FLASH_DRIVER_TYPES)),)
         $(call CATASTROPHIC_ERROR,Invalid FLASH_DRIVER,FLASH_DRIVER="$(FLASH_DRIVER)" is not a valid flash driver)
     else
-        OPT_DEFS += -DFLASH_ENABLE -DFLASH_DRIVER -DFLASH_DRIVER_$(strip $(shell echo $(FLASH_DRIVER) | tr '[:lower:]' '[:upper:]'))
-		COMMON_VPATH += $(DRIVER_PATH)/flash
+        OPT_DEFS += -DFLASH_ENABLE
         ifeq ($(strip $(FLASH_DRIVER)),spi)
-            SRC += flash_spi.c
             SPI_DRIVER_REQUIRED = yes
+            OPT_DEFS += -DFLASH_DRIVER -DFLASH_SPI
+            COMMON_VPATH += $(DRIVER_PATH)/flash
+            SRC += flash_spi.c
         endif
     endif
 endif
@@ -311,11 +311,11 @@ ifeq ($(strip $(RGBLIGHT_ENABLE)), yes)
         POST_CONFIG_H += $(QUANTUM_DIR)/rgblight/rgblight_post_config.h
         OPT_DEFS += -DRGBLIGHT_ENABLE
         OPT_DEFS += -DRGBLIGHT_$(strip $(shell echo $(RGBLIGHT_DRIVER) | tr '[:lower:]' '[:upper:]'))
-        SRC += $(QUANTUM_DIR)/process_keycode/process_underglow.c
         SRC += $(QUANTUM_DIR)/color.c
         SRC += $(QUANTUM_DIR)/rgblight/rgblight.c
         SRC += $(QUANTUM_DIR)/rgblight/rgblight_drivers.c
         CIE1931_CURVE := yes
+        RGB_KEYCODES_ENABLE := yes
     endif
 
     ifeq ($(strip $(RGBLIGHT_DRIVER)), ws2812)
@@ -437,13 +437,6 @@ ifeq ($(strip $(LED_MATRIX_ENABLE)), yes)
         SRC += snled27351-mono.c
     endif
 
-    ifeq ($(strip $(LED_MATRIX_CUSTOM_KB)), yes)
-        OPT_DEFS += -DLED_MATRIX_CUSTOM_KB
-    endif
-
-    ifeq ($(strip $(LED_MATRIX_CUSTOM_USER)), yes)
-        OPT_DEFS += -DLED_MATRIX_CUSTOM_USER
-    endif
 endif
 
 # Deprecated driver names - do not use
@@ -468,16 +461,12 @@ ifeq ($(strip $(RGB_MATRIX_ENABLE)), yes)
     COMMON_VPATH += $(QUANTUM_DIR)/rgb_matrix/animations
     COMMON_VPATH += $(QUANTUM_DIR)/rgb_matrix/animations/runners
     POST_CONFIG_H += $(QUANTUM_DIR)/rgb_matrix/post_config.h
-
-    # TODO: Remove this
-    SRC += $(QUANTUM_DIR)/process_keycode/process_underglow.c
-
-    SRC += $(QUANTUM_DIR)/process_keycode/process_rgb_matrix.c
     SRC += $(QUANTUM_DIR)/color.c
     SRC += $(QUANTUM_DIR)/rgb_matrix/rgb_matrix.c
     SRC += $(QUANTUM_DIR)/rgb_matrix/rgb_matrix_drivers.c
     LIB8TION_ENABLE := yes
     CIE1931_CURVE := yes
+    RGB_KEYCODES_ENABLE := yes
 
     ifeq ($(strip $(RGB_MATRIX_DRIVER)), aw20216s)
         SPI_DRIVER_REQUIRED = yes
@@ -580,6 +569,10 @@ ifeq ($(strip $(RGB_MATRIX_ENABLE)), yes)
     endif
 endif
 
+ifeq ($(strip $(RGB_KEYCODES_ENABLE)), yes)
+    SRC += $(QUANTUM_DIR)/process_keycode/process_rgb.c
+endif
+
 VARIABLE_TRACE ?= no
 ifneq ($(strip $(VARIABLE_TRACE)),no)
     SRC += $(QUANTUM_DIR)/variable_trace.c
@@ -637,18 +630,6 @@ ifeq ($(strip $(VIA_ENABLE)), yes)
     RAW_ENABLE := yes
     BOOTMAGIC_ENABLE := yes
     TRI_LAYER_ENABLE := yes
-    ifeq ($(strip $(VIA_INSECURE)), yes)
-        OPT_DEFS += -DVIA_INSECURE
-    endif
-endif
-
-ifeq ($(strip $(RAW_ENABLE)), yes)
-    OPT_DEFS += -DRAW_ENABLE
-    SRC += raw_hid.c
-endif
-
-ifeq ($(strip $(DYNAMIC_KEYMAP_ENABLE)), yes)
-    SEND_STRING_ENABLE := yes
 endif
 
 VALID_CUSTOM_MATRIX_TYPES:= yes lite no
@@ -729,7 +710,6 @@ ifeq ($(strip $(LIB8TION_ENABLE)), yes)
         # ATmegaxxU2 does not have hardware MUL instruction - lib8tion must be told to use software multiplication routines
         OPT_DEFS += -DLIB8_ATTINY
     endif
-    OPT_DEFS += -DFASTLED_SCALE8_FIXED=1 -DFASTLED_BLEND_FIXED=1
     SRC += $(LIB_PATH)/lib8tion/lib8tion.c
 endif
 
@@ -901,19 +881,19 @@ ifeq ($(strip $(BLUETOOTH_ENABLE)), yes)
     OPT_DEFS += -DBLUETOOTH_ENABLE
     OPT_DEFS += -DBLUETOOTH_$(strip $(shell echo $(BLUETOOTH_DRIVER) | tr '[:lower:]' '[:upper:]'))
     NO_USB_STARTUP_CHECK := yes
-    CONNECTION_ENABLE := yes
     COMMON_VPATH += $(DRIVER_PATH)/bluetooth
-    SRC += $(DRIVER_PATH)/bluetooth/bluetooth.c
+    SRC += outputselect.c
 
     ifeq ($(strip $(BLUETOOTH_DRIVER)), bluefruit_le)
         SPI_DRIVER_REQUIRED = yes
-        SRC += $(DRIVER_PATH)/bluetooth/bluetooth_drivers.c
+        ANALOG_DRIVER_REQUIRED = yes
+        SRC += $(DRIVER_PATH)/bluetooth/bluetooth.c
         SRC += $(DRIVER_PATH)/bluetooth/bluefruit_le.cpp
     endif
 
     ifeq ($(strip $(BLUETOOTH_DRIVER)), rn42)
         UART_DRIVER_REQUIRED = yes
-        SRC += $(DRIVER_PATH)/bluetooth/bluetooth_drivers.c
+        SRC += $(DRIVER_PATH)/bluetooth/bluetooth.c
         SRC += $(DRIVER_PATH)/bluetooth/rn42.c
     endif
 endif
@@ -947,32 +927,6 @@ ifeq ($(strip $(DIP_SWITCH_ENABLE)), yes)
     endif
 endif
 
-ifeq ($(strip $(BATTERY_ENABLE)), yes)
-    BATTERY_DRIVER_REQUIRED := yes
-endif
-
-VALID_BATTERY_DRIVER_TYPES := adc custom vendor
-
-BATTERY_DRIVER ?= none
-ifeq ($(strip $(BATTERY_DRIVER_REQUIRED)), yes)
-    ifeq ($(filter $(BATTERY_DRIVER),$(VALID_BATTERY_DRIVER_TYPES)),)
-        $(call CATASTROPHIC_ERROR,Invalid BATTERY_DRIVER,BATTERY_DRIVER="$(BATTERY_DRIVER)" is not a valid battery driver)
-    endif
-
-    OPT_DEFS += -DBATTERY_DRIVER_$(strip $(shell echo $(BATTERY_DRIVER) | tr '[:lower:]' '[:upper:]'))
-
-    COMMON_VPATH += $(DRIVER_PATH)/battery
-
-    ifneq ($(strip $(BATTERY_DRIVER)), custom)
-        SRC += battery_$(strip $(BATTERY_DRIVER)).c
-    endif
-
-    # add extra deps
-    ifeq ($(strip $(BATTERY_DRIVER)), adc)
-        ANALOG_DRIVER_REQUIRED = yes
-    endif
-endif
-
 VALID_WS2812_DRIVER_TYPES := bitbang custom i2c pwm spi vendor
 
 WS2812_DRIVER ?= bitbang
@@ -983,9 +937,7 @@ ifeq ($(strip $(WS2812_DRIVER_REQUIRED)), yes)
 
     OPT_DEFS += -DWS2812_$(strip $(shell echo $(WS2812_DRIVER) | tr '[:lower:]' '[:upper:]'))
 
-    COMMON_VPATH += $(DRIVER_PATH)/led
-
-    SRC += ws2812.c ws2812_$(strip $(WS2812_DRIVER)).c
+    SRC += ws2812_$(strip $(WS2812_DRIVER)).c
 
     ifeq ($(strip $(PLATFORM)), CHIBIOS)
         ifeq ($(strip $(WS2812_DRIVER)), pwm)

builddefs/common_rules.mk

@@ -43,25 +43,25 @@ ifneq ($(USE_CCACHE),no)
     CC_PREFIX ?= ccache
 endif
 
-#---------------- Debug Options ----------------
-
-DEBUG_ENABLE ?= no
-ifeq ($(strip $(DEBUG_ENABLE)),yes)
-	CFLAGS 	 += -ggdb3
-	CXXFLAGS += -ggdb3
-	ASFLAGS  += -ggdb3
-# Create a map file when debugging
-	LDFLAGS  += -Wl,-Map=$(BUILD_DIR)/$(TARGET).map,--cref
-endif
-
-
 #---------------- C Compiler Options ----------------
 
 ifeq ($(strip $(LTO_ENABLE)), yes)
+    ifeq ($(PLATFORM),ARM_ATSAM)
+        $(info Enabling LTO on arm_atsam-targeting boards is known to have a high likelihood of failure.)
+        $(info If unsure, set LTO_ENABLE = no.)
+    endif
     CDEFS += -flto
     CDEFS += -DLTO_ENABLE
 endif
 
+DEBUG_ENABLE ?= yes
+ifeq ($(strip $(SKIP_DEBUG_INFO)),yes)
+  DEBUG_ENABLE=no
+endif
+
+ifeq ($(strip $(DEBUG_ENABLE)),yes)
+  CFLAGS += -g$(DEBUG)
+endif
 CFLAGS += $(CDEFS)
 CFLAGS += -O$(OPT)
 # add color
@@ -83,6 +83,9 @@ CFLAGS += -fcommon
 
 #---------------- C++ Compiler Options ----------------
 
+ifeq ($(strip $(DEBUG_ENABLE)),yes)
+  CXXFLAGS += -g$(DEBUG)
+endif
 CXXFLAGS += $(CXXDEFS)
 CXXFLAGS += -O$(OPT)
 # to suppress "warning: only initialized variables can be placed into program memory area"
@@ -103,10 +106,14 @@ endif
 
 #---------------- Linker Options ----------------
 
+CREATE_MAP ?= yes
+ifeq ($(CREATE_MAP),yes)
+	LDFLAGS += -Wl,-Map=$(BUILD_DIR)/$(TARGET).map,--cref
+endif
 ifeq ($(VERBOSE_LD_CMD),yes)
 	LDFLAGS += -v
 endif
-
+#LDFLAGS += -Wl,--relax
 LDFLAGS += $(EXTMEMOPTS)
 LDFLAGS += $(patsubst %,-L%,$(EXTRALIBDIRS))
 LDFLAGS += -lm
@@ -119,11 +126,15 @@ ADHLNS_ENABLE ?= no
 ifeq ($(ADHLNS_ENABLE),yes)
   # Avoid "Options to '-Xassembler' do not match" - only specify assembler options at LTO link time
   ifeq ($(strip $(LTO_ENABLE)), yes)
-    LDFLAGS  += -Wa,-adhlns=$(BUILD_DIR)/$(TARGET).lst
+    LDFLAGS += -Wa,-adhlns=$(BUILD_DIR)/$(TARGET).lst
   else
-    CFLAGS   += -Wa,-adhlns=$(@:%.o=%.lst)
+    CFLAGS += -Wa,-adhlns=$(@:%.o=%.lst)
     CXXFLAGS += -Wa,-adhlns=$(@:%.o=%.lst)
-	ASFLAGS  += -Wa,-adhlns=$(@:%.o=%.lst),--listing-cont-lines=100
+    ifeq ($(strip $(DEBUG_ENABLE)),yes)
+      ASFLAGS = -Wa,-adhlns=$(@:%.o=%.lst),-gstabs,--listing-cont-lines=100
+    else
+      ASFLAGS = -Wa,-adhlns=$(@:%.o=%.lst),--listing-cont-lines=100
+    endif
   endif
 endif
 
@@ -168,7 +179,7 @@ MOVE_DEP = mv -f $(patsubst %.o,%.td,$@) $(patsubst %.o,%.d,$@)
 
 # For a ChibiOS build, ensure that the board files have the hook overrides injected
 define BOARDSRC_INJECT_HOOKS
-$(INTERMEDIATE_OUTPUT)/$(patsubst %.c,%.o,$(patsubst ./%,%,$1)): FILE_SPECIFIC_CFLAGS += -include $(TOP_DIR)/tmk_core/protocol/chibios/init_hooks.h
+$(INTERMEDIATE_OUTPUT)/$(patsubst %.c,%.o,$(patsubst ./%,%,$1)): INIT_HOOK_CFLAGS += -include $(TOP_DIR)/tmk_core/protocol/chibios/init_hooks.h
 endef
 $(foreach LOBJ, $(BOARDSRC), $(eval $(call BOARDSRC_INJECT_HOOKS,$(LOBJ))))
 
@@ -289,10 +300,10 @@ $1/%.o : %.c $1/%.d $1/cflags.txt $1/compiler.txt | $(BEGIN)
     ifneq ($$(VERBOSE_C_INCLUDE),)
 	$$(if $$(filter $$(notdir $$(VERBOSE_C_INCLUDE)),$$(notdir $$<)),$$(eval CC_EXEC += -H))
     endif
-	$$(eval CMD := $$(CC_EXEC) -c $$($1_CFLAGS) $$(FILE_SPECIFIC_CFLAGS) $$(GENDEPFLAGS) $$< -o $$@ && $$(MOVE_DEP))
+	$$(eval CMD := $$(CC_EXEC) -c $$($1_CFLAGS) $$(INIT_HOOK_CFLAGS) $$(GENDEPFLAGS) $$< -o $$@ && $$(MOVE_DEP))
 	@$$(BUILD_CMD)
     ifneq ($$(DUMP_C_MACROS),)
-	$$(eval CMD := $$(CC) -E -dM $$($1_CFLAGS) $$(FILE_SPECIFIC_CFLAGS) $$(GENDEPFLAGS) $$<)
+	$$(eval CMD := $$(CC) -E -dM $$($1_CFLAGS) $$(INIT_HOOK_CFLAGS) $$(GENDEPFLAGS) $$<)
 	@$$(if $$(filter $$(notdir $$(DUMP_C_MACROS)),$$(notdir $$<)),$$(BUILD_CMD))
     endif
 
@@ -300,13 +311,13 @@ $1/%.o : %.c $1/%.d $1/cflags.txt $1/compiler.txt | $(BEGIN)
 $1/%.o : %.cpp $1/%.d $1/cxxflags.txt $1/compiler.txt | $(BEGIN)
 	@mkdir -p $$(@D)
 	@$$(SILENT) || printf "$$(MSG_COMPILING_CXX) $$<" | $$(AWK_CMD)
-	$$(eval CMD=$$(CC) -c $$($1_CXXFLAGS) $$(FILE_SPECIFIC_CFLAGS) $$(GENDEPFLAGS) $$< -o $$@ && $$(MOVE_DEP))
+	$$(eval CMD=$$(CC) -c $$($1_CXXFLAGS) $$(INIT_HOOK_CFLAGS) $$(GENDEPFLAGS) $$< -o $$@ && $$(MOVE_DEP))
 	@$$(BUILD_CMD)
 
 $1/%.o : %.cc $1/%.d $1/cxxflags.txt $1/compiler.txt | $(BEGIN)
 	@mkdir -p $$(@D)
 	@$$(SILENT) || printf "$$(MSG_COMPILING_CXX) $$<" | $$(AWK_CMD)
-	$$(eval CMD=$$(CC) -c $$($1_CXXFLAGS) $$(FILE_SPECIFIC_CFLAGS) $$(GENDEPFLAGS) $$< -o $$@ && $$(MOVE_DEP))
+	$$(eval CMD=$$(CC) -c $$($1_CXXFLAGS) $$(INIT_HOOK_CFLAGS) $$(GENDEPFLAGS) $$< -o $$@ && $$(MOVE_DEP))
 	@$$(BUILD_CMD)
 
 # Assemble: create object files from assembler source files.

builddefs/converters.mk

@@ -1,3 +1,15 @@
+# Note for new boards -- CTPC and CONVERT_TO_PROTON_C are deprecated terms
+# and should not be replicated for new boards. These will be removed from
+# documentation as well as existing keymaps in due course.
+ifneq ($(findstring yes, $(CTPC)$(CONVERT_TO_PROTON_C)),)
+$(call CATASTROPHIC_ERROR,The `CONVERT_TO_PROTON_C` and `CTPC` options are now deprecated. `CONVERT_TO=proton_c` should be used instead.)
+endif
+
+ifneq (,$(filter $(MCU),atmega32u4))
+    # TODO: opt in rather than assume everything uses a pro micro
+    PIN_COMPATIBLE ?= promicro
+endif
+
 # Remove whitespace from any rule.mk provided vars
 #   - env cannot be overwritten but cannot have whitespace anyway
 CONVERT_TO:=$(strip $(CONVERT_TO))
@@ -20,6 +32,9 @@ ifneq ($(CONVERT_TO),)
 
     PLATFORM_KEY = $(shell echo $(CONVERTER) | cut -d "/" -f2)
 
+    # force setting as value can be from environment
+    override TARGET := $(TARGET)_$(CONVERT_TO)
+
     # Configure any defaults
     OPT_DEFS += -DCONVERT_TO_$(shell echo $(CONVERT_TO) | tr '[:lower:]' '[:upper:]')
     OPT_DEFS += -DCONVERTER_TARGET=\"$(CONVERT_TO)\"

builddefs/docsgen/.vitepress/config.mts

@@ -33,21 +33,14 @@ export default defineConfig(({ mode }) => {
             },
             title: 'QMK Firmware',
 
-            nav: [{ text: "Home", link: "/" }],
+            nav: [{ text: "Home", link: "./" }],
 
             search: {
                 provider: "local",
             },
 
-            editLink: {
-                pattern: 'https://github.com/qmk/qmk_firmware/edit/master/docs/:path'
-            },
-            lastUpdated: true,
-
             sidebar: sidebar,
 
-            externalLinkIcon: true,
-
             socialLinks: [
                 { icon: { svg: '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 50 50" width="50px" height="50px"><path d="M 29 3 C 28.0625 3 27.164063 3.382813 26.5 4 C 25.835938 4.617188 25.363281 5.433594 25 6.40625 C 24.355469 8.140625 24.085938 10.394531 24.03125 13.03125 C 19.234375 13.179688 14.820313 14.421875 11.28125 16.46875 C 10.214844 15.46875 8.855469 14.96875 7.5 14.96875 C 6.089844 14.96875 4.675781 15.511719 3.59375 16.59375 C 1.425781 18.761719 1.425781 22.238281 3.59375 24.40625 L 3.84375 24.65625 C 3.3125 26.035156 3 27.488281 3 29 C 3 33.527344 5.566406 37.585938 9.5625 40.4375 C 13.558594 43.289063 19.007813 45 25 45 C 30.992188 45 36.441406 43.289063 40.4375 40.4375 C 44.433594 37.585938 47 33.527344 47 29 C 47 27.488281 46.6875 26.035156 46.15625 24.65625 L 46.40625 24.40625 C 48.574219 22.238281 48.574219 18.761719 46.40625 16.59375 C 45.324219 15.511719 43.910156 14.96875 42.5 14.96875 C 41.144531 14.96875 39.785156 15.46875 38.71875 16.46875 C 35.195313 14.433594 30.800781 13.191406 26.03125 13.03125 C 26.09375 10.546875 26.363281 8.46875 26.875 7.09375 C 27.164063 6.316406 27.527344 5.757813 27.875 5.4375 C 28.222656 5.117188 28.539063 5 29 5 C 29.460938 5 29.683594 5.125 30.03125 5.40625 C 30.378906 5.6875 30.785156 6.148438 31.3125 6.6875 C 32.253906 7.652344 33.695313 8.714844 36.09375 8.9375 C 36.539063 11.238281 38.574219 13 41 13 C 43.75 13 46 10.75 46 8 C 46 5.25 43.75 3 41 3 C 38.605469 3 36.574219 4.710938 36.09375 6.96875 C 34.3125 6.796875 33.527344 6.109375 32.75 5.3125 C 32.300781 4.851563 31.886719 4.3125 31.3125 3.84375 C 30.738281 3.375 29.9375 3 29 3 Z M 41 5 C 42.667969 5 44 6.332031 44 8 C 44 9.667969 42.667969 11 41 11 C 39.332031 11 38 9.667969 38 8 C 38 6.332031 39.332031 5 41 5 Z M 25 15 C 30.609375 15 35.675781 16.613281 39.28125 19.1875 C 42.886719 21.761719 45 25.226563 45 29 C 45 32.773438 42.886719 36.238281 39.28125 38.8125 C 35.675781 41.386719 30.609375 43 25 43 C 19.390625 43 14.324219 41.386719 10.71875 38.8125 C 7.113281 36.238281 5 32.773438 5 29 C 5 25.226563 7.113281 21.761719 10.71875 19.1875 C 14.324219 16.613281 19.390625 15 25 15 Z M 7.5 16.9375 C 8.203125 16.9375 8.914063 17.148438 9.53125 17.59375 C 7.527344 19.03125 5.886719 20.769531 4.75 22.71875 C 3.582031 21.296875 3.660156 19.339844 5 18 C 5.714844 17.285156 6.609375 16.9375 7.5 16.9375 Z M 42.5 16.9375 C 43.390625 16.9375 44.285156 17.285156 45 18 C 46.339844 19.339844 46.417969 21.296875 45.25 22.71875 C 44.113281 20.769531 42.472656 19.03125 40.46875 17.59375 C 41.085938 17.148438 41.796875 16.9375 42.5 16.9375 Z M 17 22 C 14.800781 22 13 23.800781 13 26 C 13 28.199219 14.800781 30 17 30 C 19.199219 30 21 28.199219 21 26 C 21 23.800781 19.199219 22 17 22 Z M 33 22 C 30.800781 22 29 23.800781 29 26 C 29 28.199219 30.800781 30 33 30 C 35.199219 30 37 28.199219 37 26 C 37 23.800781 35.199219 22 33 22 Z M 17 24 C 18.117188 24 19 24.882813 19 26 C 19 27.117188 18.117188 28 17 28 C 15.882813 28 15 27.117188 15 26 C 15 24.882813 15.882813 24 17 24 Z M 33 24 C 34.117188 24 35 24.882813 35 26 C 35 27.117188 34.117188 28 33 28 C 31.882813 28 31 27.117188 31 26 C 31 24.882813 31.882813 24 33 24 Z M 34.15625 33.84375 C 34.101563 33.851563 34.050781 33.859375 34 33.875 C 33.683594 33.9375 33.417969 34.144531 33.28125 34.4375 C 33.28125 34.4375 32.757813 35.164063 31.4375 36 C 30.117188 36.835938 28.058594 37.6875 25 37.6875 C 21.941406 37.6875 19.882813 36.835938 18.5625 36 C 17.242188 35.164063 16.71875 34.4375 16.71875 34.4375 C 16.492188 34.082031 16.066406 33.90625 15.65625 34 C 15.332031 34.082031 15.070313 34.316406 14.957031 34.632813 C 14.84375 34.945313 14.894531 35.292969 15.09375 35.5625 C 15.09375 35.5625 15.863281 36.671875 17.46875 37.6875 C 19.074219 38.703125 21.558594 39.6875 25 39.6875 C 28.441406 39.6875 30.925781 38.703125 32.53125 37.6875 C 34.136719 36.671875 34.90625 35.5625 34.90625 35.5625 C 35.207031 35.273438 35.296875 34.824219 35.128906 34.441406 C 34.960938 34.058594 34.574219 33.820313 34.15625 33.84375 Z"/></svg>' }, link: "https://reddit.com/r/olkb" },
                 { icon: "discord", link: "https://discord.gg/qmk" },

builddefs/docsgen/.vitepress/theme/QMKLayout.vue

@@ -2,22 +2,11 @@
 import DefaultTheme from 'vitepress/theme'
 import { useRouter } from 'vitepress'
 import { onBeforeMount } from 'vue';
-import aliases from "../../../../docs/_aliases.json";
 
 const router = useRouter()
 onBeforeMount(async () => {
-    // Convert from docsify-style to vitepress-style URLs
-    let newUrl = window.location.href.replace(/\/#\//, '/').replace(/\?id=/, '#');
-
-    // Convert any aliases
-    let testUrl = new URL(newUrl);
-    while (testUrl.pathname in aliases) {
-        testUrl.pathname = aliases[testUrl.pathname];
-    }
-    newUrl = testUrl.toString();
-
-    // Redirect if required
-    if (newUrl != window.location.href) {
+    if (window.location.href.includes('/#/')) {
+        const newUrl = window.location.href.replace(/\/#\//, '/').replace(/\?id=/, '#');
         window.history.replaceState({}, '', newUrl);
         await router.go(newUrl);
     }

builddefs/docsgen/.vitepress/theme/custom.css

@@ -1,19 +1,7 @@
 /* Override <kbd> as vitepress doesn't put them with borders */
 kbd {
     border: 1px solid var(--vp-c-text-1);
-    border-radius: 5px;
+    border-radius: 0.6em;
     margin: 0.2em;
     padding: 0.2em;
 }
-
-:root {
-    --vp-nav-logo-height: 32px;
-
-    --vp-layout-max-width: calc(98% + 64px);
-
-    --vp-sidebar-width: 300px;
-}
-
-.VPDoc.has-aside .content-container {
-    max-width: unset !important;
-}

builddefs/docsgen/package.json

@@ -1,7 +1,7 @@
 {
   "license": "GPL-2.0-or-later",
   "devDependencies": {
-    "vite": "^5.4.21",
+    "vite": "^5.2.10",
     "vitepress": "^1.1.0",
     "vitepress-plugin-tabs": "^0.5.0",
     "vue": "^3.4.24"

builddefs/docsgen/yarn.lock

@@ -178,220 +178,205 @@
     "@docsearch/css" "3.6.0"
     algoliasearch "^4.19.1"
 
-"@esbuild/aix-ppc64@0.21.5":
-  version "0.21.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/aix-ppc64/-/aix-ppc64-0.21.5.tgz#c7184a326533fcdf1b8ee0733e21c713b975575f"
-  integrity sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ==
+"@esbuild/aix-ppc64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/aix-ppc64/-/aix-ppc64-0.20.2.tgz#a70f4ac11c6a1dfc18b8bbb13284155d933b9537"
+  integrity sha512-D+EBOJHXdNZcLJRBkhENNG8Wji2kgc9AZ9KiPr1JuZjsNtyHzrsfLRrY0tk2H2aoFu6RANO1y1iPPUCDYWkb5g==
 
-"@esbuild/android-arm64@0.21.5":
-  version "0.21.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.21.5.tgz#09d9b4357780da9ea3a7dfb833a1f1ff439b4052"
-  integrity sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A==
+"@esbuild/android-arm64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.20.2.tgz#db1c9202a5bc92ea04c7b6840f1bbe09ebf9e6b9"
+  integrity sha512-mRzjLacRtl/tWU0SvD8lUEwb61yP9cqQo6noDZP/O8VkwafSYwZ4yWy24kan8jE/IMERpYncRt2dw438LP3Xmg==
 
-"@esbuild/android-arm@0.21.5":
-  version "0.21.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.21.5.tgz#9b04384fb771926dfa6d7ad04324ecb2ab9b2e28"
-  integrity sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg==
+"@esbuild/android-arm@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.20.2.tgz#3b488c49aee9d491c2c8f98a909b785870d6e995"
+  integrity sha512-t98Ra6pw2VaDhqNWO2Oph2LXbz/EJcnLmKLGBJwEwXX/JAN83Fym1rU8l0JUWK6HkIbWONCSSatf4sf2NBRx/w==
 
-"@esbuild/android-x64@0.21.5":
-  version "0.21.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.21.5.tgz#29918ec2db754cedcb6c1b04de8cd6547af6461e"
-  integrity sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA==
+"@esbuild/android-x64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.20.2.tgz#3b1628029e5576249d2b2d766696e50768449f98"
+  integrity sha512-btzExgV+/lMGDDa194CcUQm53ncxzeBrWJcncOBxuC6ndBkKxnHdFJn86mCIgTELsooUmwUm9FkhSp5HYu00Rg==
 
-"@esbuild/darwin-arm64@0.21.5":
-  version "0.21.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.21.5.tgz#e495b539660e51690f3928af50a76fb0a6ccff2a"
-  integrity sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ==
+"@esbuild/darwin-arm64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.20.2.tgz#6e8517a045ddd86ae30c6608c8475ebc0c4000bb"
+  integrity sha512-4J6IRT+10J3aJH3l1yzEg9y3wkTDgDk7TSDFX+wKFiWjqWp/iCfLIYzGyasx9l0SAFPT1HwSCR+0w/h1ES/MjA==
 
-"@esbuild/darwin-x64@0.21.5":
-  version "0.21.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.21.5.tgz#c13838fa57372839abdddc91d71542ceea2e1e22"
-  integrity sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw==
+"@esbuild/darwin-x64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.20.2.tgz#90ed098e1f9dd8a9381695b207e1cff45540a0d0"
+  integrity sha512-tBcXp9KNphnNH0dfhv8KYkZhjc+H3XBkF5DKtswJblV7KlT9EI2+jeA8DgBjp908WEuYll6pF+UStUCfEpdysA==
 
-"@esbuild/freebsd-arm64@0.21.5":
-  version "0.21.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.21.5.tgz#646b989aa20bf89fd071dd5dbfad69a3542e550e"
-  integrity sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g==
+"@esbuild/freebsd-arm64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.20.2.tgz#d71502d1ee89a1130327e890364666c760a2a911"
+  integrity sha512-d3qI41G4SuLiCGCFGUrKsSeTXyWG6yem1KcGZVS+3FYlYhtNoNgYrWcvkOoaqMhwXSMrZRl69ArHsGJ9mYdbbw==
 
-"@esbuild/freebsd-x64@0.21.5":
-  version "0.21.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.21.5.tgz#aa615cfc80af954d3458906e38ca22c18cf5c261"
-  integrity sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ==
+"@esbuild/freebsd-x64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.20.2.tgz#aa5ea58d9c1dd9af688b8b6f63ef0d3d60cea53c"
+  integrity sha512-d+DipyvHRuqEeM5zDivKV1KuXn9WeRX6vqSqIDgwIfPQtwMP4jaDsQsDncjTDDsExT4lR/91OLjRo8bmC1e+Cw==
 
-"@esbuild/linux-arm64@0.21.5":
-  version "0.21.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.21.5.tgz#70ac6fa14f5cb7e1f7f887bcffb680ad09922b5b"
-  integrity sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q==
+"@esbuild/linux-arm64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.20.2.tgz#055b63725df678379b0f6db9d0fa85463755b2e5"
+  integrity sha512-9pb6rBjGvTFNira2FLIWqDk/uaf42sSyLE8j1rnUpuzsODBq7FvpwHYZxQ/It/8b+QOS1RYfqgGFNLRI+qlq2A==
 
-"@esbuild/linux-arm@0.21.5":
-  version "0.21.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.21.5.tgz#fc6fd11a8aca56c1f6f3894f2bea0479f8f626b9"
-  integrity sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA==
+"@esbuild/linux-arm@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.20.2.tgz#76b3b98cb1f87936fbc37f073efabad49dcd889c"
+  integrity sha512-VhLPeR8HTMPccbuWWcEUD1Az68TqaTYyj6nfE4QByZIQEQVWBB8vup8PpR7y1QHL3CpcF6xd5WVBU/+SBEvGTg==
 
-"@esbuild/linux-ia32@0.21.5":
-  version "0.21.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.21.5.tgz#3271f53b3f93e3d093d518d1649d6d68d346ede2"
-  integrity sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg==
+"@esbuild/linux-ia32@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.20.2.tgz#c0e5e787c285264e5dfc7a79f04b8b4eefdad7fa"
+  integrity sha512-o10utieEkNPFDZFQm9CoP7Tvb33UutoJqg3qKf1PWVeeJhJw0Q347PxMvBgVVFgouYLGIhFYG0UGdBumROyiig==
 
-"@esbuild/linux-loong64@0.21.5":
-  version "0.21.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.21.5.tgz#ed62e04238c57026aea831c5a130b73c0f9f26df"
-  integrity sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg==
+"@esbuild/linux-loong64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.20.2.tgz#a6184e62bd7cdc63e0c0448b83801001653219c5"
+  integrity sha512-PR7sp6R/UC4CFVomVINKJ80pMFlfDfMQMYynX7t1tNTeivQ6XdX5r2XovMmha/VjR1YN/HgHWsVcTRIMkymrgQ==
 
-"@esbuild/linux-mips64el@0.21.5":
-  version "0.21.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.21.5.tgz#e79b8eb48bf3b106fadec1ac8240fb97b4e64cbe"
-  integrity sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg==
+"@esbuild/linux-mips64el@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.20.2.tgz#d08e39ce86f45ef8fc88549d29c62b8acf5649aa"
+  integrity sha512-4BlTqeutE/KnOiTG5Y6Sb/Hw6hsBOZapOVF6njAESHInhlQAghVVZL1ZpIctBOoTFbQyGW+LsVYZ8lSSB3wkjA==
 
-"@esbuild/linux-ppc64@0.21.5":
-  version "0.21.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.21.5.tgz#5f2203860a143b9919d383ef7573521fb154c3e4"
-  integrity sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w==
+"@esbuild/linux-ppc64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.20.2.tgz#8d252f0b7756ffd6d1cbde5ea67ff8fd20437f20"
+  integrity sha512-rD3KsaDprDcfajSKdn25ooz5J5/fWBylaaXkuotBDGnMnDP1Uv5DLAN/45qfnf3JDYyJv/ytGHQaziHUdyzaAg==
 
-"@esbuild/linux-riscv64@0.21.5":
-  version "0.21.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.21.5.tgz#07bcafd99322d5af62f618cb9e6a9b7f4bb825dc"
-  integrity sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA==
+"@esbuild/linux-riscv64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.20.2.tgz#19f6dcdb14409dae607f66ca1181dd4e9db81300"
+  integrity sha512-snwmBKacKmwTMmhLlz/3aH1Q9T8v45bKYGE3j26TsaOVtjIag4wLfWSiZykXzXuE1kbCE+zJRmwp+ZbIHinnVg==
 
-"@esbuild/linux-s390x@0.21.5":
-  version "0.21.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.21.5.tgz#b7ccf686751d6a3e44b8627ababc8be3ef62d8de"
-  integrity sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A==
+"@esbuild/linux-s390x@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.20.2.tgz#3c830c90f1a5d7dd1473d5595ea4ebb920988685"
+  integrity sha512-wcWISOobRWNm3cezm5HOZcYz1sKoHLd8VL1dl309DiixxVFoFe/o8HnwuIwn6sXre88Nwj+VwZUvJf4AFxkyrQ==
 
-"@esbuild/linux-x64@0.21.5":
-  version "0.21.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.21.5.tgz#6d8f0c768e070e64309af8004bb94e68ab2bb3b0"
-  integrity sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ==
+"@esbuild/linux-x64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.20.2.tgz#86eca35203afc0d9de0694c64ec0ab0a378f6fff"
+  integrity sha512-1MdwI6OOTsfQfek8sLwgyjOXAu+wKhLEoaOLTjbijk6E2WONYpH9ZU2mNtR+lZ2B4uwr+usqGuVfFT9tMtGvGw==
 
-"@esbuild/netbsd-x64@0.21.5":
-  version "0.21.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.21.5.tgz#bbe430f60d378ecb88decb219c602667387a6047"
-  integrity sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg==
+"@esbuild/netbsd-x64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.20.2.tgz#e771c8eb0e0f6e1877ffd4220036b98aed5915e6"
+  integrity sha512-K8/DhBxcVQkzYc43yJXDSyjlFeHQJBiowJ0uVL6Tor3jGQfSGHNNJcWxNbOI8v5k82prYqzPuwkzHt3J1T1iZQ==
 
-"@esbuild/openbsd-x64@0.21.5":
-  version "0.21.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.21.5.tgz#99d1cf2937279560d2104821f5ccce220cb2af70"
-  integrity sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow==
+"@esbuild/openbsd-x64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.20.2.tgz#9a795ae4b4e37e674f0f4d716f3e226dd7c39baf"
+  integrity sha512-eMpKlV0SThJmmJgiVyN9jTPJ2VBPquf6Kt/nAoo6DgHAoN57K15ZghiHaMvqjCye/uU4X5u3YSMgVBI1h3vKrQ==
 
-"@esbuild/sunos-x64@0.21.5":
-  version "0.21.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.21.5.tgz#08741512c10d529566baba837b4fe052c8f3487b"
-  integrity sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg==
+"@esbuild/sunos-x64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.20.2.tgz#7df23b61a497b8ac189def6e25a95673caedb03f"
+  integrity sha512-2UyFtRC6cXLyejf/YEld4Hajo7UHILetzE1vsRcGL3earZEW77JxrFjH4Ez2qaTiEfMgAXxfAZCm1fvM/G/o8w==
 
-"@esbuild/win32-arm64@0.21.5":
-  version "0.21.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.21.5.tgz#675b7385398411240735016144ab2e99a60fc75d"
-  integrity sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A==
+"@esbuild/win32-arm64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.20.2.tgz#f1ae5abf9ca052ae11c1bc806fb4c0f519bacf90"
+  integrity sha512-GRibxoawM9ZCnDxnP3usoUDO9vUkpAxIIZ6GQI+IlVmr5kP3zUq+l17xELTHMWTWzjxa2guPNyrpq1GWmPvcGQ==
 
-"@esbuild/win32-ia32@0.21.5":
-  version "0.21.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.21.5.tgz#1bfc3ce98aa6ca9a0969e4d2af72144c59c1193b"
-  integrity sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA==
+"@esbuild/win32-ia32@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.20.2.tgz#241fe62c34d8e8461cd708277813e1d0ba55ce23"
+  integrity sha512-HfLOfn9YWmkSKRQqovpnITazdtquEW8/SoHW7pWpuEeguaZI4QnCRW6b+oZTztdBnZOS2hqJ6im/D5cPzBTTlQ==
 
-"@esbuild/win32-x64@0.21.5":
-  version "0.21.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.21.5.tgz#acad351d582d157bb145535db2a6ff53dd514b5c"
-  integrity sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw==
+"@esbuild/win32-x64@0.20.2":
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.20.2.tgz#9c907b21e30a52db959ba4f80bb01a0cc403d5cc"
+  integrity sha512-N49X4lJX27+l9jbLKSqZ6bKNjzQvHaT8IIFUy+YIqmXQdjYCToGWwOItDrfby14c78aDd5NHQl29xingXfCdLQ==
 
 "@jridgewell/sourcemap-codec@^1.4.15":
   version "1.4.15"
   resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz#d7c6e6755c78567a951e04ab52ef0fd26de59f32"
   integrity sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==
 
-"@rollup/rollup-android-arm-eabi@4.31.0":
-  version "4.31.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.31.0.tgz#d4dd60da0075a6ce9a6c76d71b8204f3e1822285"
-  integrity sha512-9NrR4033uCbUBRgvLcBrJofa2KY9DzxL2UKZ1/4xA/mnTNyhZCWBuD8X3tPm1n4KxcgaraOYgrFKSgwjASfmlA==
+"@rollup/rollup-android-arm-eabi@4.16.4":
+  version "4.16.4"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.16.4.tgz#5e8930291f1e5ead7fb1171d53ba5c87718de062"
+  integrity sha512-GkhjAaQ8oUTOKE4g4gsZ0u8K/IHU1+2WQSgS1TwTcYvL+sjbaQjNHFXbOJ6kgqGHIO1DfUhI/Sphi9GkRT9K+Q==
 
-"@rollup/rollup-android-arm64@4.31.0":
-  version "4.31.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.31.0.tgz#25c4d33259a7a2ccd2f52a5ffcc0bb3ab3f0729d"
-  integrity sha512-iBbODqT86YBFHajxxF8ebj2hwKm1k8PTBQSojSt3d1FFt1gN+xf4CowE47iN0vOSdnd+5ierMHBbu/rHc7nq5g==
+"@rollup/rollup-android-arm64@4.16.4":
+  version "4.16.4"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.16.4.tgz#ffb84f1359c04ec8a022a97110e18a5600f5f638"
+  integrity sha512-Bvm6D+NPbGMQOcxvS1zUl8H7DWlywSXsphAeOnVeiZLQ+0J6Is8T7SrjGTH29KtYkiY9vld8ZnpV3G2EPbom+w==
 
-"@rollup/rollup-darwin-arm64@4.31.0":
-  version "4.31.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.31.0.tgz#d137dff254b19163a6b52ac083a71cd055dae844"
-  integrity sha512-WHIZfXgVBX30SWuTMhlHPXTyN20AXrLH4TEeH/D0Bolvx9PjgZnn4H677PlSGvU6MKNsjCQJYczkpvBbrBnG6g==
+"@rollup/rollup-darwin-arm64@4.16.4":
+  version "4.16.4"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.16.4.tgz#b2fcee8d4806a0b1b9185ac038cc428ddedce9f4"
+  integrity sha512-i5d64MlnYBO9EkCOGe5vPR/EeDwjnKOGGdd7zKFhU5y8haKhQZTN2DgVtpODDMxUr4t2K90wTUJg7ilgND6bXw==
 
-"@rollup/rollup-darwin-x64@4.31.0":
-  version "4.31.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.31.0.tgz#58ff20b5dacb797d3adca19f02a21c532f9d55bf"
-  integrity sha512-hrWL7uQacTEF8gdrQAqcDy9xllQ0w0zuL1wk1HV8wKGSGbKPVjVUv/DEwT2+Asabf8Dh/As+IvfdU+H8hhzrQQ==
+"@rollup/rollup-darwin-x64@4.16.4":
+  version "4.16.4"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.16.4.tgz#fcb25ccbaa3dd33a6490e9d1c64bab2e0e16b932"
+  integrity sha512-WZupV1+CdUYehaZqjaFTClJI72fjJEgTXdf4NbW69I9XyvdmztUExBtcI2yIIU6hJtYvtwS6pkTkHJz+k08mAQ==
 
-"@rollup/rollup-freebsd-arm64@4.31.0":
-  version "4.31.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.31.0.tgz#96ce1a241c591ec3e068f4af765d94eddb24e60c"
-  integrity sha512-S2oCsZ4hJviG1QjPY1h6sVJLBI6ekBeAEssYKad1soRFv3SocsQCzX6cwnk6fID6UQQACTjeIMB+hyYrFacRew==
+"@rollup/rollup-linux-arm-gnueabihf@4.16.4":
+  version "4.16.4"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.16.4.tgz#40d46bdfe667e5eca31bf40047460e326d2e26bb"
+  integrity sha512-ADm/xt86JUnmAfA9mBqFcRp//RVRt1ohGOYF6yL+IFCYqOBNwy5lbEK05xTsEoJq+/tJzg8ICUtS82WinJRuIw==
 
-"@rollup/rollup-freebsd-x64@4.31.0":
-  version "4.31.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.31.0.tgz#e59e7ede505be41f0b4311b0b943f8eb44938467"
-  integrity sha512-pCANqpynRS4Jirn4IKZH4tnm2+2CqCNLKD7gAdEjzdLGbH1iO0zouHz4mxqg0uEMpO030ejJ0aA6e1PJo2xrPA==
+"@rollup/rollup-linux-arm-musleabihf@4.16.4":
+  version "4.16.4"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.16.4.tgz#7741df2448c11c56588b50835dbfe91b1a10b375"
+  integrity sha512-tJfJaXPiFAG+Jn3cutp7mCs1ePltuAgRqdDZrzb1aeE3TktWWJ+g7xK9SNlaSUFw6IU4QgOxAY4rA+wZUT5Wfg==
 
-"@rollup/rollup-linux-arm-gnueabihf@4.31.0":
-  version "4.31.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.31.0.tgz#e455ca6e4ff35bd46d62201c153352e717000a7b"
-  integrity sha512-0O8ViX+QcBd3ZmGlcFTnYXZKGbFu09EhgD27tgTdGnkcYXLat4KIsBBQeKLR2xZDCXdIBAlWLkiXE1+rJpCxFw==
+"@rollup/rollup-linux-arm64-gnu@4.16.4":
+  version "4.16.4"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.16.4.tgz#0a23b02d2933e4c4872ad18d879890b6a4a295df"
+  integrity sha512-7dy1BzQkgYlUTapDTvK997cgi0Orh5Iu7JlZVBy1MBURk7/HSbHkzRnXZa19ozy+wwD8/SlpJnOOckuNZtJR9w==
 
-"@rollup/rollup-linux-arm-musleabihf@4.31.0":
-  version "4.31.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.31.0.tgz#bc1a93d807d19e70b1e343a5bfea43723bcd6327"
-  integrity sha512-w5IzG0wTVv7B0/SwDnMYmbr2uERQp999q8FMkKG1I+j8hpPX2BYFjWe69xbhbP6J9h2gId/7ogesl9hwblFwwg==
+"@rollup/rollup-linux-arm64-musl@4.16.4":
+  version "4.16.4"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.16.4.tgz#e37ef259358aa886cc07d782220a4fb83c1e6970"
+  integrity sha512-zsFwdUw5XLD1gQe0aoU2HVceI6NEW7q7m05wA46eUAyrkeNYExObfRFQcvA6zw8lfRc5BHtan3tBpo+kqEOxmg==
 
-"@rollup/rollup-linux-arm64-gnu@4.31.0":
-  version "4.31.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.31.0.tgz#f38bf843f1dc3d5de680caf31084008846e3efae"
-  integrity sha512-JyFFshbN5xwy6fulZ8B/8qOqENRmDdEkcIMF0Zz+RsfamEW+Zabl5jAb0IozP/8UKnJ7g2FtZZPEUIAlUSX8cA==
+"@rollup/rollup-linux-powerpc64le-gnu@4.16.4":
+  version "4.16.4"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.16.4.tgz#8c69218b6de05ee2ba211664a2d2ac1e54e43f94"
+  integrity sha512-p8C3NnxXooRdNrdv6dBmRTddEapfESEUflpICDNKXpHvTjRRq1J82CbU5G3XfebIZyI3B0s074JHMWD36qOW6w==
 
-"@rollup/rollup-linux-arm64-musl@4.31.0":
-  version "4.31.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.31.0.tgz#b3987a96c18b7287129cf735be2dbf83e94d9d05"
-  integrity sha512-kpQXQ0UPFeMPmPYksiBL9WS/BDiQEjRGMfklVIsA0Sng347H8W2iexch+IEwaR7OVSKtr2ZFxggt11zVIlZ25g==
+"@rollup/rollup-linux-riscv64-gnu@4.16.4":
+  version "4.16.4"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.16.4.tgz#d32727dab8f538d9a4a7c03bcf58c436aecd0139"
+  integrity sha512-Lh/8ckoar4s4Id2foY7jNgitTOUQczwMWNYi+Mjt0eQ9LKhr6sK477REqQkmy8YHY3Ca3A2JJVdXnfb3Rrwkng==
 
-"@rollup/rollup-linux-loongarch64-gnu@4.31.0":
-  version "4.31.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.31.0.tgz#0f0324044e71c4f02e9f49e7ec4e347b655b34ee"
-  integrity sha512-pMlxLjt60iQTzt9iBb3jZphFIl55a70wexvo8p+vVFK+7ifTRookdoXX3bOsRdmfD+OKnMozKO6XM4zR0sHRrQ==
+"@rollup/rollup-linux-s390x-gnu@4.16.4":
+  version "4.16.4"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.16.4.tgz#d46097246a187d99fc9451fe8393b7155b47c5ec"
+  integrity sha512-1xwwn9ZCQYuqGmulGsTZoKrrn0z2fAur2ujE60QgyDpHmBbXbxLaQiEvzJWDrscRq43c8DnuHx3QorhMTZgisQ==
 
-"@rollup/rollup-linux-powerpc64le-gnu@4.31.0":
-  version "4.31.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.31.0.tgz#809479f27f1fd5b4eecd2aa732132ad952d454ba"
-  integrity sha512-D7TXT7I/uKEuWiRkEFbed1UUYZwcJDU4vZQdPTcepK7ecPhzKOYk4Er2YR4uHKme4qDeIh6N3XrLfpuM7vzRWQ==
+"@rollup/rollup-linux-x64-gnu@4.16.4":
+  version "4.16.4"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.16.4.tgz#6356c5a03a4afb1c3057490fc51b4764e109dbc7"
+  integrity sha512-LuOGGKAJ7dfRtxVnO1i3qWc6N9sh0Em/8aZ3CezixSTM+E9Oq3OvTsvC4sm6wWjzpsIlOCnZjdluINKESflJLA==
 
-"@rollup/rollup-linux-riscv64-gnu@4.31.0":
-  version "4.31.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.31.0.tgz#7bc75c4f22db04d3c972f83431739cfa41c6a36e"
-  integrity sha512-wal2Tc8O5lMBtoePLBYRKj2CImUCJ4UNGJlLwspx7QApYny7K1cUYlzQ/4IGQBLmm+y0RS7dwc3TDO/pmcneTw==
+"@rollup/rollup-linux-x64-musl@4.16.4":
+  version "4.16.4"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.16.4.tgz#03a5831a9c0d05877b94653b5ddd3020d3c6fb06"
+  integrity sha512-ch86i7KkJKkLybDP2AtySFTRi5fM3KXp0PnHocHuJMdZwu7BuyIKi35BE9guMlmTpwwBTB3ljHj9IQXnTCD0vA==
 
-"@rollup/rollup-linux-s390x-gnu@4.31.0":
-  version "4.31.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.31.0.tgz#cfe8052345c55864d83ae343362cf1912480170e"
-  integrity sha512-O1o5EUI0+RRMkK9wiTVpk2tyzXdXefHtRTIjBbmFREmNMy7pFeYXCFGbhKFwISA3UOExlo5GGUuuj3oMKdK6JQ==
+"@rollup/rollup-win32-arm64-msvc@4.16.4":
+  version "4.16.4"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.16.4.tgz#6cc0db57750376b9303bdb6f5482af8974fcae35"
+  integrity sha512-Ma4PwyLfOWZWayfEsNQzTDBVW8PZ6TUUN1uFTBQbF2Chv/+sjenE86lpiEwj2FiviSmSZ4Ap4MaAfl1ciF4aSA==
 
-"@rollup/rollup-linux-x64-gnu@4.31.0":
-  version "4.31.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.31.0.tgz#c6b048f1e25f3fea5b4bd246232f4d07a159c5a0"
-  integrity sha512-zSoHl356vKnNxwOWnLd60ixHNPRBglxpv2g7q0Cd3Pmr561gf0HiAcUBRL3S1vPqRC17Zo2CX/9cPkqTIiai1g==
+"@rollup/rollup-win32-ia32-msvc@4.16.4":
+  version "4.16.4"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.16.4.tgz#aea0b7e492bd9ed46971cb80bc34f1eb14e07789"
+  integrity sha512-9m/ZDrQsdo/c06uOlP3W9G2ENRVzgzbSXmXHT4hwVaDQhYcRpi9bgBT0FTG9OhESxwK0WjQxYOSfv40cU+T69w==
 
-"@rollup/rollup-linux-x64-musl@4.31.0":
-  version "4.31.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.31.0.tgz#615273ac52d1a201f4de191cbd3389016a9d7d80"
-  integrity sha512-ypB/HMtcSGhKUQNiFwqgdclWNRrAYDH8iMYH4etw/ZlGwiTVxBz2tDrGRrPlfZu6QjXwtd+C3Zib5pFqID97ZA==
-
-"@rollup/rollup-win32-arm64-msvc@4.31.0":
-  version "4.31.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.31.0.tgz#32ed85810c1b831c648eca999d68f01255b30691"
-  integrity sha512-JuhN2xdI/m8Hr+aVO3vspO7OQfUFO6bKLIRTAy0U15vmWjnZDLrEgCZ2s6+scAYaQVpYSh9tZtRijApw9IXyMw==
-
-"@rollup/rollup-win32-ia32-msvc@4.31.0":
-  version "4.31.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.31.0.tgz#d47effada68bcbfdccd30c4a788d42e4542ff4d3"
-  integrity sha512-U1xZZXYkvdf5MIWmftU8wrM5PPXzyaY1nGCI4KI4BFfoZxHamsIe+BtnPLIvvPykvQWlVbqUXdLa4aJUuilwLQ==
-
-"@rollup/rollup-win32-x64-msvc@4.31.0":
-  version "4.31.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.31.0.tgz#7a2d89a82cf0388d60304964217dd7beac6de645"
-  integrity sha512-ul8rnCsUumNln5YWwz0ted2ZHFhzhRRnkpBZ+YRuHoRAlUji9KChpOUOndY7uykrPEPXVbHLlsdo6v5yXo/TXw==
+"@rollup/rollup-win32-x64-msvc@4.16.4":
+  version "4.16.4"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.16.4.tgz#c09ad9a132ccb5a67c4f211d909323ab1294f95f"
+  integrity sha512-YunpoOAyGLDseanENHmbFvQSfVL5BxW3k7hhy0eN4rb3gS/ct75dVD0EXOWIqFT/nE8XYW6LP6vz6ctKRi0k9A==
 
 "@shikijs/core@1.3.0", "@shikijs/core@^1.3.0":
   version "1.3.0"
@@ -405,10 +390,10 @@
   dependencies:
     shiki "1.3.0"
 
-"@types/estree@1.0.6":
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.6.tgz#628effeeae2064a1b4e79f78e81d87b7e5fc7b50"
-  integrity sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==
+"@types/estree@1.0.5":
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.5.tgz#a6ce3e556e00fd9895dd872dd172ad0d4bd687f4"
+  integrity sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==
 
 "@types/linkify-it@*":
   version "3.0.5"
@@ -604,34 +589,34 @@ entities@^4.5.0:
   resolved "https://registry.yarnpkg.com/entities/-/entities-4.5.0.tgz#5d268ea5e7113ec74c4d033b79ea5a35a488fb48"
   integrity sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==
 
-esbuild@^0.21.3:
-  version "0.21.5"
-  resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.21.5.tgz#9ca301b120922959b766360d8ac830da0d02997d"
-  integrity sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==
+esbuild@^0.20.1:
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.20.2.tgz#9d6b2386561766ee6b5a55196c6d766d28c87ea1"
+  integrity sha512-WdOOppmUNU+IbZ0PaDiTst80zjnrOkyJNHoKupIcVyU8Lvla3Ugx94VzkQ32Ijqd7UhHJy75gNWDMUekcrSJ6g==
   optionalDependencies:
-    "@esbuild/aix-ppc64" "0.21.5"
-    "@esbuild/android-arm" "0.21.5"
-    "@esbuild/android-arm64" "0.21.5"
-    "@esbuild/android-x64" "0.21.5"
-    "@esbuild/darwin-arm64" "0.21.5"
-    "@esbuild/darwin-x64" "0.21.5"
-    "@esbuild/freebsd-arm64" "0.21.5"
-    "@esbuild/freebsd-x64" "0.21.5"
-    "@esbuild/linux-arm" "0.21.5"
-    "@esbuild/linux-arm64" "0.21.5"
-    "@esbuild/linux-ia32" "0.21.5"
-    "@esbuild/linux-loong64" "0.21.5"
-    "@esbuild/linux-mips64el" "0.21.5"
-    "@esbuild/linux-ppc64" "0.21.5"
-    "@esbuild/linux-riscv64" "0.21.5"
-    "@esbuild/linux-s390x" "0.21.5"
-    "@esbuild/linux-x64" "0.21.5"
-    "@esbuild/netbsd-x64" "0.21.5"
-    "@esbuild/openbsd-x64" "0.21.5"
-    "@esbuild/sunos-x64" "0.21.5"
-    "@esbuild/win32-arm64" "0.21.5"
-    "@esbuild/win32-ia32" "0.21.5"
-    "@esbuild/win32-x64" "0.21.5"
+    "@esbuild/aix-ppc64" "0.20.2"
+    "@esbuild/android-arm" "0.20.2"
+    "@esbuild/android-arm64" "0.20.2"
+    "@esbuild/android-x64" "0.20.2"
+    "@esbuild/darwin-arm64" "0.20.2"
+    "@esbuild/darwin-x64" "0.20.2"
+    "@esbuild/freebsd-arm64" "0.20.2"
+    "@esbuild/freebsd-x64" "0.20.2"
+    "@esbuild/linux-arm" "0.20.2"
+    "@esbuild/linux-arm64" "0.20.2"
+    "@esbuild/linux-ia32" "0.20.2"
+    "@esbuild/linux-loong64" "0.20.2"
+    "@esbuild/linux-mips64el" "0.20.2"
+    "@esbuild/linux-ppc64" "0.20.2"
+    "@esbuild/linux-riscv64" "0.20.2"
+    "@esbuild/linux-s390x" "0.20.2"
+    "@esbuild/linux-x64" "0.20.2"
+    "@esbuild/netbsd-x64" "0.20.2"
+    "@esbuild/openbsd-x64" "0.20.2"
+    "@esbuild/sunos-x64" "0.20.2"
+    "@esbuild/win32-arm64" "0.20.2"
+    "@esbuild/win32-ia32" "0.20.2"
+    "@esbuild/win32-x64" "0.20.2"
 
 estree-walker@^2.0.2:
   version "2.0.2"
@@ -677,29 +662,29 @@ mitt@^3.0.1:
   resolved "https://registry.yarnpkg.com/mitt/-/mitt-3.0.1.tgz#ea36cf0cc30403601ae074c8f77b7092cdab36d1"
   integrity sha512-vKivATfr97l2/QBCYAkXYDbrIWPM2IIKEl7YPhjCvKlG3kE2gm+uBo6nEXK3M5/Ffh/FLpKExzOQ3JJoJGFKBw==
 
-nanoid@^3.3.8:
-  version "3.3.8"
-  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.8.tgz#b1be3030bee36aaff18bacb375e5cce521684baf"
-  integrity sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==
+nanoid@^3.3.7:
+  version "3.3.7"
+  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.7.tgz#d0c301a691bc8d54efa0a2226ccf3fe2fd656bd8"
+  integrity sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==
 
 perfect-debounce@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/perfect-debounce/-/perfect-debounce-1.0.0.tgz#9c2e8bc30b169cc984a58b7d5b28049839591d2a"
   integrity sha512-xCy9V055GLEqoFaHoC1SoLIaLmWctgCUaBaWxDZ7/Zx4CTyX7cJQLJOok/orfjZAh9kEYpjJa4d0KcJmCbctZA==
 
-picocolors@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.1.1.tgz#3d321af3eab939b083c8f929a1d12cda81c26b6b"
-  integrity sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==
+picocolors@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c"
+  integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==
 
-postcss@^8.4.38, postcss@^8.4.43:
-  version "8.5.1"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.5.1.tgz#e2272a1f8a807fafa413218245630b5db10a3214"
-  integrity sha512-6oz2beyjc5VMn/KV1pPw8fliQkhBXrVn1Z3TVyqZxU8kZpzEKhBdmCFqI6ZbmGtamQvQGuU1sgPTk8ZrXDD7jQ==
+postcss@^8.4.38:
+  version "8.4.38"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.38.tgz#b387d533baf2054288e337066d81c6bee9db9e0e"
+  integrity sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==
   dependencies:
-    nanoid "^3.3.8"
-    picocolors "^1.1.1"
-    source-map-js "^1.2.1"
+    nanoid "^3.3.7"
+    picocolors "^1.0.0"
+    source-map-js "^1.2.0"
 
 preact@^10.0.0:
   version "10.20.2"
@@ -711,32 +696,29 @@ rfdc@^1.3.1:
   resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.3.1.tgz#2b6d4df52dffe8bb346992a10ea9451f24373a8f"
   integrity sha512-r5a3l5HzYlIC68TpmYKlxWjmOP6wiPJ1vWv2HeLhNsRZMrCkxeqxiHlQ21oXmQ4F3SiryXBHhAD7JZqvOJjFmg==
 
-rollup@^4.20.0:
-  version "4.31.0"
-  resolved "https://registry.yarnpkg.com/rollup/-/rollup-4.31.0.tgz#b84af969a0292cb047dce2c0ec5413a9457597a4"
-  integrity sha512-9cCE8P4rZLx9+PjoyqHLs31V9a9Vpvfo4qNcs6JCiGWYhw2gijSetFbH6SSy1whnkgcefnUwr8sad7tgqsGvnw==
+rollup@^4.13.0:
+  version "4.16.4"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-4.16.4.tgz#fe328eb41293f20c9593a095ec23bdc4b5d93317"
+  integrity sha512-kuaTJSUbz+Wsb2ATGvEknkI12XV40vIiHmLuFlejoo7HtDok/O5eDDD0UpCVY5bBX5U5RYo8wWP83H7ZsqVEnA==
   dependencies:
-    "@types/estree" "1.0.6"
+    "@types/estree" "1.0.5"
   optionalDependencies:
-    "@rollup/rollup-android-arm-eabi" "4.31.0"
-    "@rollup/rollup-android-arm64" "4.31.0"
-    "@rollup/rollup-darwin-arm64" "4.31.0"
-    "@rollup/rollup-darwin-x64" "4.31.0"
-    "@rollup/rollup-freebsd-arm64" "4.31.0"
-    "@rollup/rollup-freebsd-x64" "4.31.0"
-    "@rollup/rollup-linux-arm-gnueabihf" "4.31.0"
-    "@rollup/rollup-linux-arm-musleabihf" "4.31.0"
-    "@rollup/rollup-linux-arm64-gnu" "4.31.0"
-    "@rollup/rollup-linux-arm64-musl" "4.31.0"
-    "@rollup/rollup-linux-loongarch64-gnu" "4.31.0"
-    "@rollup/rollup-linux-powerpc64le-gnu" "4.31.0"
-    "@rollup/rollup-linux-riscv64-gnu" "4.31.0"
-    "@rollup/rollup-linux-s390x-gnu" "4.31.0"
-    "@rollup/rollup-linux-x64-gnu" "4.31.0"
-    "@rollup/rollup-linux-x64-musl" "4.31.0"
-    "@rollup/rollup-win32-arm64-msvc" "4.31.0"
-    "@rollup/rollup-win32-ia32-msvc" "4.31.0"
-    "@rollup/rollup-win32-x64-msvc" "4.31.0"
+    "@rollup/rollup-android-arm-eabi" "4.16.4"
+    "@rollup/rollup-android-arm64" "4.16.4"
+    "@rollup/rollup-darwin-arm64" "4.16.4"
+    "@rollup/rollup-darwin-x64" "4.16.4"
+    "@rollup/rollup-linux-arm-gnueabihf" "4.16.4"
+    "@rollup/rollup-linux-arm-musleabihf" "4.16.4"
+    "@rollup/rollup-linux-arm64-gnu" "4.16.4"
+    "@rollup/rollup-linux-arm64-musl" "4.16.4"
+    "@rollup/rollup-linux-powerpc64le-gnu" "4.16.4"
+    "@rollup/rollup-linux-riscv64-gnu" "4.16.4"
+    "@rollup/rollup-linux-s390x-gnu" "4.16.4"
+    "@rollup/rollup-linux-x64-gnu" "4.16.4"
+    "@rollup/rollup-linux-x64-musl" "4.16.4"
+    "@rollup/rollup-win32-arm64-msvc" "4.16.4"
+    "@rollup/rollup-win32-ia32-msvc" "4.16.4"
+    "@rollup/rollup-win32-x64-msvc" "4.16.4"
     fsevents "~2.3.2"
 
 shiki@1.3.0, shiki@^1.3.0:
@@ -751,11 +733,6 @@ source-map-js@^1.2.0:
   resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.2.0.tgz#16b809c162517b5b8c3e7dcd315a2a5c2612b2af"
   integrity sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==
 
-source-map-js@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.2.1.tgz#1ce5650fddd87abc099eda37dcff024c2667ae46"
-  integrity sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==
-
 speakingurl@^14.0.1:
   version "14.0.1"
   resolved "https://registry.yarnpkg.com/speakingurl/-/speakingurl-14.0.1.tgz#f37ec8ddc4ab98e9600c1c9ec324a8c48d772a53"
@@ -766,14 +743,14 @@ tabbable@^6.2.0:
   resolved "https://registry.yarnpkg.com/tabbable/-/tabbable-6.2.0.tgz#732fb62bc0175cfcec257330be187dcfba1f3b97"
   integrity sha512-Cat63mxsVJlzYvN51JmVXIgNoUokrIaT2zLclCXjRd8boZ0004U4KCs/sToJ75C6sdlByWxpYnb5Boif1VSFew==
 
-vite@^5.2.9, vite@^5.4.21:
-  version "5.4.21"
-  resolved "https://registry.yarnpkg.com/vite/-/vite-5.4.21.tgz#84a4f7c5d860b071676d39ba513c0d598fdc7027"
-  integrity sha512-o5a9xKjbtuhY6Bi5S3+HvbRERmouabWbyUcpXXUA1u+GNUKoROi9byOJ8M0nHbHYHkYICiMlqxkg1KkYmm25Sw==
+vite@^5.2.10, vite@^5.2.9:
+  version "5.2.10"
+  resolved "https://registry.yarnpkg.com/vite/-/vite-5.2.10.tgz#2ac927c91e99d51b376a5c73c0e4b059705f5bd7"
+  integrity sha512-PAzgUZbP7msvQvqdSD+ErD5qGnSFiGOoWmV5yAKUEI0kdhjbH6nMWVyZQC/hSc4aXwc0oJ9aEdIiF9Oje0JFCw==
   dependencies:
-    esbuild "^0.21.3"
-    postcss "^8.4.43"
-    rollup "^4.20.0"
+    esbuild "^0.20.1"
+    postcss "^8.4.38"
+    rollup "^4.13.0"
   optionalDependencies:
     fsevents "~2.3.3"
 

builddefs/generic_features.mk

@@ -21,12 +21,10 @@ SPACE_CADET_ENABLE ?= yes
 GENERIC_FEATURES = \
     AUTO_SHIFT \
     AUTOCORRECT \
-    BATTERY \
     BOOTMAGIC \
     CAPS_WORD \
     COMBO \
     COMMAND \
-    CONNECTION \
     CRC \
     DEFERRED_EXEC \
     DIGITIZER \
@@ -36,10 +34,8 @@ GENERIC_FEATURES = \
     DYNAMIC_TAPPING_TERM \
     GRAVE_ESC \
     HAPTIC \
-    KEYCODE_STRING \
     KEY_LOCK \
     KEY_OVERRIDE \
-    LAYER_LOCK \
     LEADER \
     MAGIC \
     MOUSEKEY \
@@ -63,7 +59,6 @@ define HANDLE_GENERIC_FEATURE
     SRC += $$(wildcard $$(QUANTUM_DIR)/process_keycode/process_$2.c)
     SRC += $$(wildcard $$(QUANTUM_DIR)/$2/$2.c)
     SRC += $$(wildcard $$(QUANTUM_DIR)/$2.c)
-    SRC += $$(wildcard $$(QUANTUM_DIR)/nvm/$$(NVM_DRIVER_LOWER)/nvm_$2.c)
     VPATH += $$(wildcard $$(QUANTUM_DIR)/$2/)
     OPT_DEFS += -D$1_ENABLE
 endef

builddefs/show_options.mk

@@ -67,6 +67,7 @@ OTHER_OPTION_NAMES = \
   PS2_DRIVER \
   RAW_ENABLE \
   SWAP_HANDS_ENABLE \
+  RING_BUFFERED_6KRO_REPORT_ENABLE \
   WATCHDOG_ENABLE \
   ERGOINU \
   NO_USB_STARTUP_CHECK \

builddefs/support.mk

@@ -1,11 +0,0 @@
-# Helper to determine if a compiler option is supported
-# Args:
-#   $(1) = option to test, if successful will be output
-#   $(2) = option to use if $(1) is not supported
-#   $(3) = additional arguments to pass to the compiler during the test, but aren't contained in the output
-cc-option = $(shell \
-	if { echo 'int main(){return 0;}' | $(CC) $(1) $(3) -o /dev/null -x c /dev/null >/dev/null 2>&1; }; \
-	then echo "$(1)"; else echo "$(2)"; fi)
-
-# Helper to pass comma character to make functions (use with `$(,)` to pass in `$(call ...)` arguments)
-, := ,

builddefs/testlist.mk

@@ -1,7 +1,6 @@
 TEST_LIST = $(sort $(patsubst %/test.mk,%, $(shell find $(ROOT_DIR)tests -type f -name test.mk)))
 FULL_TESTS := $(notdir $(TEST_LIST))
 
-include $(QUANTUM_PATH)/battery/tests/testlist.mk
 include $(QUANTUM_PATH)/debounce/tests/testlist.mk
 include $(QUANTUM_PATH)/encoder/tests/testlist.mk
 include $(QUANTUM_PATH)/os_detection/tests/testlist.mk

data/constants/keycodes/extras/keycodes_belgian_0.0.1.hjson

@@ -372,4 +372,4 @@
             "label": "~",
         }
     }
-}
+}

data/constants/keycodes/extras/keycodes_bepo_0.0.1.hjson

@@ -629,4 +629,4 @@
             "label": "(narrow non-breaking space)",
         }
     }
-}
+}

data/constants/keycodes/extras/keycodes_brazilian_abnt2_0.0.1.hjson

@@ -376,4 +376,4 @@
             "label": "₢",
         }
     }
-}
+}

data/constants/keycodes/extras/keycodes_canadian_multilingual_0.0.1.hjson

@@ -638,4 +638,4 @@
             "label": "÷",
         }
     }
-}
+}

data/constants/keycodes/extras/keycodes_colemak_0.0.1.hjson

@@ -299,4 +299,4 @@
             "label": "?",
         }
     }
-}
+}

data/constants/keycodes/extras/keycodes_croatian_0.0.1.hjson

@@ -400,4 +400,4 @@
             "label": "§",
         }
     }
-}
+}

data/constants/keycodes/extras/keycodes_czech_0.0.1.hjson

@@ -432,4 +432,4 @@
             "label": "*",
         }
     }
-}
+}

data/constants/keycodes/extras/keycodes_danish_0.0.1.hjson

@@ -356,4 +356,4 @@
             "label": "µ",
         }
     }
-}
+}

data/constants/keycodes/extras/keycodes_dvorak_0.0.1.hjson

@@ -299,4 +299,4 @@
             "label": ":",
         }
     }
-}
+}

data/constants/keycodes/extras/keycodes_dvorak_fr_0.0.1.hjson

@@ -314,4 +314,4 @@
             "label": "@",
         }
     }
-}
+}

data/constants/keycodes/extras/keycodes_dvorak_programmer_0.0.1.hjson

@@ -299,4 +299,4 @@
             "label": "\"",
         }
     }
-}
+}

data/constants/keycodes/extras/keycodes_estonian_0.0.1.hjson

@@ -364,4 +364,4 @@
             "label": "ž",
         }
     }
-}
+}

data/constants/keycodes/extras/keycodes_eurkey_0.0.1.hjson

@@ -1,596 +0,0 @@
-{
-    "aliases": {
-/*
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
- * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │       │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
- * │     │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │  \  │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
- * │      │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │        │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤
- * │        │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │          │
- * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤
- * │    │    │    │                        │    │    │    │    │
- * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
- */
-        "KC_GRV": {
-            "key": "EU_GRV",
-            "label": "`",
-        }
-        "KC_1": {
-            "key": "EU_1",
-            "label": "1",
-        }
-        "KC_2": {
-            "key": "EU_2",
-            "label": "2",
-        }
-        "KC_3": {
-            "key": "EU_3",
-            "label": "3",
-        }
-        "KC_4": {
-            "key": "EU_4",
-            "label": "4",
-        }
-        "KC_5": {
-            "key": "EU_5",
-            "label": "5",
-        }
-        "KC_6": {
-            "key": "EU_6",
-            "label": "6",
-        }
-        "KC_7": {
-            "key": "EU_7",
-            "label": "7",
-        }
-        "KC_8": {
-            "key": "EU_8",
-            "label": "8",
-        }
-        "KC_9": {
-            "key": "EU_9",
-            "label": "9",
-        }
-        "KC_0": {
-            "key": "EU_0",
-            "label": "0",
-        }
-        "KC_MINS": {
-            "key": "EU_MINS",
-            "label": "-",
-        }
-        "KC_EQL": {
-            "key": "EU_EQL",
-            "label": "=",
-        }
-        "KC_Q": {
-            "key": "EU_Q",
-            "label": "Q",
-        }
-        "KC_W": {
-            "key": "EU_W",
-            "label": "W",
-        }
-        "KC_E": {
-            "key": "EU_E",
-            "label": "E",
-        }
-        "KC_R": {
-            "key": "EU_R",
-            "label": "R",
-        }
-        "KC_T": {
-            "key": "EU_T",
-            "label": "T",
-        }
-        "KC_Y": {
-            "key": "EU_Y",
-            "label": "Y",
-        }
-        "KC_U": {
-            "key": "EU_U",
-            "label": "U",
-        }
-        "KC_I": {
-            "key": "EU_I",
-            "label": "I",
-        }
-        "KC_O": {
-            "key": "EU_O",
-            "label": "O",
-        }
-        "KC_P": {
-            "key": "EU_P",
-            "label": "P",
-        }
-        "KC_LBRC": {
-            "key": "EU_LBRC",
-            "label": "[",
-        }
-        "KC_RBRC": {
-            "key": "EU_RBRC",
-            "label": "]",
-        }
-        "KC_BSLS": {
-            "key": "EU_BSLS",
-            "label": "\\",
-        }
-        "KC_A": {
-            "key": "EU_A",
-            "label": "A",
-        }
-        "KC_S": {
-            "key": "EU_S",
-            "label": "S",
-        }
-        "KC_D": {
-            "key": "EU_D",
-            "label": "D",
-        }
-        "KC_F": {
-            "key": "EU_F",
-            "label": "F",
-        }
-        "KC_G": {
-            "key": "EU_G",
-            "label": "G",
-        }
-        "KC_H": {
-            "key": "EU_H",
-            "label": "H",
-        }
-        "KC_J": {
-            "key": "EU_J",
-            "label": "J",
-        }
-        "KC_K": {
-            "key": "EU_K",
-            "label": "K",
-        }
-        "KC_L": {
-            "key": "EU_L",
-            "label": "L",
-        }
-        "KC_SCLN": {
-            "key": "EU_SCLN",
-            "label": ";",
-        }
-        "KC_QUOT": {
-            "key": "EU_QUOT",
-            "label": "'",
-        }
-        "KC_Z": {
-            "key": "EU_Z",
-            "label": "Z",
-        }
-        "KC_X": {
-            "key": "EU_X",
-            "label": "X",
-        }
-        "KC_C": {
-            "key": "EU_C",
-            "label": "C",
-        }
-        "KC_V": {
-            "key": "EU_V",
-            "label": "V",
-        }
-        "KC_B": {
-            "key": "EU_B",
-            "label": "B",
-        }
-        "KC_N": {
-            "key": "EU_N",
-            "label": "N",
-        }
-        "KC_M": {
-            "key": "EU_M",
-            "label": "M",
-        }
-        "KC_COMM": {
-            "key": "EU_COMM",
-            "label": ",",
-        }
-        "KC_DOT": {
-            "key": "EU_DOT",
-            "label": ".",
-        }
-        "KC_SLSH": {
-            "key": "EU_SLSH",
-            "label": "/",
-        }
-/* Shifted symbols
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
- * │ ~ │ ! │ @ │ # │ $ │ % │ ^ │ & │ * │ ( │ ) │ _ │ + │       │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
- * │     │   │   │   │   │   │   │   │   │   │   │ { │ } │  |  │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
- * │      │   │   │   │   │   │   │   │   │   │ : │ " │        │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤
- * │        │   │   │   │   │   │   │   │ < │ > │ ? │          │
- * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤
- * │    │    │    │                        │    │    │    │    │
- * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
- */
-        "S(EU_GRV)": {
-            "key": "EU_TILD",
-            "label": "~",
-        }
-        "S(EU_1)": {
-            "key": "EU_EXLM",
-            "label": "!",
-        }
-        "S(EU_2)": {
-            "key": "EU_AT",
-            "label": "@",
-        }
-        "S(EU_3)": {
-            "key": "EU_HASH",
-            "label": "#",
-        }
-        "S(EU_4)": {
-            "key": "EU_DLR",
-            "label": "$",
-        }
-        "S(EU_5)": {
-            "key": "EU_PERC",
-            "label": "%",
-        }
-        "S(EU_6)": {
-            "key": "EU_CIRC",
-            "label": "^",
-        }
-        "S(EU_7)": {
-            "key": "EU_AMPR",
-            "label": "&",
-        }
-        "S(EU_8)": {
-            "key": "EU_ASTR",
-            "label": "*",
-        }
-        "S(EU_9)": {
-            "key": "EU_LPRN",
-            "label": "(",
-        }
-        "S(EU_0)": {
-            "key": "EU_RPRN",
-            "label": ")",
-        }
-        "S(EU_MINS)": {
-            "key": "EU_UNDS",
-            "label": "_",
-        }
-        "S(EU_EQL)": {
-            "key": "EU_PLUS",
-            "label": "+",
-        }
-        "S(EU_LBRC)": {
-            "key": "EU_LCBR",
-            "label": "{",
-        }
-        "S(EU_RBRC)": {
-            "key": "EU_RCBR",
-            "label": "}",
-        }
-        "S(EU_BSLS)": {
-            "key": "EU_PIPE",
-            "label": "|",
-        }
-        "S(EU_SCLN)": {
-            "key": "EU_COLN",
-            "label": ":",
-        }
-        "S(EU_QUOT)": {
-            "key": "EU_DQUO",
-            "label": "\"",
-        }
-        "S(EU_COMM)": {
-            "key": "EU_LABK",
-            "label": "<",
-        }
-        "S(EU_DOT)": {
-            "key": "EU_RABK",
-            "label": ">",
-        }
-        "S(EU_SLSH)": {
-            "key": "EU_QUES",
-            "label": "?",
-        }
-/* AltGr symbols
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
- * │ ` │ ¡ │ ª │ º │ £ │ € │ ^ │ ˚ │ „ │ “ │ ” │ – │ × │       │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
- * │     │ æ │ å │ ë │ ý │ þ │ ÿ │ ü │ ï │ ö │ œ │ « │ » │  ¬  │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
- * │      │ ä │ ß │ ð │ è │ é │ ù │ ú │ ij │ ø │ ° │ ´ │        │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤
- * │        │ à │ á │ ç │ ì │ í │ ñ │ μ │ ò │ ó │ ¿ │          │
- * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤
- * │    │    │    │                        │    │    │    │    │
- * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
- */
-        "ALGR(EU_GRV)": {
-            "key": "EU_DGRV",
-            "label": "` (dead)",
-        }
-        "ALGR(EU_1)": {
-            "key": "EU_IEXL",
-            "label": "¡",
-        }
-        "ALGR(EU_2)": {
-            "key": "EU_FORD",
-            "label": "ª",
-        }
-        "ALGR(EU_3)": {
-            "key": "EU_MORD",
-            "label": "º",
-        }
-        "ALGR(EU_4)": {
-            "key": "EU_PND",
-            "label": "£",
-        }
-        "ALGR(EU_5)": {
-            "key": "EU_EURO",
-            "label": "€",
-        }
-        "ALGR(EU_6)": {
-            "key": "EU_DCIR",
-            "label": "^ (dead)",
-        }
-        "ALGR(EU_7)": {
-            "key": "EU_RNGA",
-            "label": "˚ (dead)",
-        }
-        "ALGR(EU_8)": {
-            "key": "EU_DLQU",
-            "label": "„",
-        }
-        "ALGR(EU_9)": {
-            "key": "EU_LDQU",
-            "label": "“",
-        }
-        "ALGR(EU_0)": {
-            "key": "EU_RDQU",
-            "label": "”",
-        }
-        "ALGR(EU_MINS)": {
-            "key": "EU_NDSH",
-            "label": "–",
-        }
-        "ALGR(EU_EQL)": {
-            "key": "EU_MUL",
-            "label": "×",
-        }
-        "ALGR(EU_Q)": {
-            "key": "EU_AE",
-            "label": "æ",
-        }
-        "ALGR(EU_W)": {
-            "key": "EU_ARNG",
-            "label": "Å",
-        }
-        "ALGR(EU_E)": {
-            "key": "EU_EDIA",
-            "label": "Ë",
-        }
-        "ALGR(EU_R)": {
-            "key": "EU_YACU",
-            "label": "Ý",
-        }
-        "ALGR(EU_T)": {
-            "key": "EU_THRN",
-            "label": "Þ",
-        }
-        "ALGR(EU_Y)": {
-            "key": "EU_YDIA",
-            "label": "Ÿ",
-        }
-        "ALGR(EU_U)": {
-            "key": "EU_UDIA",
-            "label": "Ü",
-        }
-        "ALGR(EU_I)": {
-            "key": "EU_IDIA",
-            "label": "Ï",
-        }
-        "ALGR(EU_O)": {
-            "key": "EU_ODIA",
-            "label": "Ö",
-        }
-        "ALGR(EU_P)": {
-            "key": "EU_OE",
-            "label": "Œ",
-        }
-        "ALGR(EU_LBRC)": {
-            "key": "EU_LDAQ",
-            "label": "«",
-        }
-        "ALGR(EU_RBRC)": {
-            "key": "EU_RDAQ",
-            "label": "»",
-        }
-        "ALGR(EU_BSLS)": {
-            "key": "EU_NOT",
-            "label": "¬",
-        }
-        "ALGR(EU_A)": {
-            "key": "EU_ADIA",
-            "label": "Ä",
-        }
-        "ALGR(EU_S)": {
-            "key": "EU_SS",
-            "label": "ß",
-        }
-        "ALGR(EU_D)": {
-            "key": "EU_ETH",
-            "label": "Ð",
-        }
-        "ALGR(EU_F)": {
-            "key": "EU_EGRV",
-            "label": "È",
-        }
-        "ALGR(EU_G)": {
-            "key": "EU_EACU",
-            "label": "É",
-        }
-        "ALGR(EU_H)": {
-            "key": "EU_UGRV",
-            "label": "Ù",
-        }
-        "ALGR(EU_J)": {
-            "key": "EU_UACU",
-            "label": "Ú",
-        }
-        "ALGR(EU_K)": {
-            "key": "EU_IJ",
-            "label": "IJ",
-        }
-        "ALGR(EU_L)": {
-            "key": "EU_OSTR",
-            "label": "Ø",
-        }
-        "ALGR(EU_SCLN)": {
-            "key": "EU_DEG",
-            "label": "°",
-        }
-        "ALGR(EU_QUOT)": {
-            "key": "EU_ACUT",
-            "label": "´ (dead)",
-        }
-        "ALGR(EU_Z)": {
-            "key": "EU_AGRV",
-            "label": "À",
-        }
-        "ALGR(EU_X)": {
-            "key": "EU_AACU",
-            "label": "Á",
-        }
-        "ALGR(EU_C)": {
-            "key": "EU_CCED",
-            "label": "Ç",
-        }
-        "ALGR(EU_V)": {
-            "key": "EU_IGRV",
-            "label": "Ì",
-        }
-        "ALGR(EU_B)": {
-            "key": "EU_IACU",
-            "label": "Í",
-        }
-        "ALGR(EU_N)": {
-            "key": "EU_NTIL",
-            "label": "Ñ",
-        }
-        "ALGR(EU_M)": {
-            "key": "EU_DGRK",
-            "label": "μ (dead Greek key)",
-        }
-        "ALGR(EU_COMM)": {
-            "key": "EU_OGRV",
-            "label": "Ò",
-        }
-        "ALGR(EU_DOT)": {
-            "key": "EU_OACU",
-            "label": "Ó",
-        }
-        "ALGR(EU_SLSH)": {
-            "key": "EU_IQUE",
-            "label": "¿",
-        }
-/* Shift+AltGr symbols
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
- * │ ~ │ ¹ │ ² │ ³ │ ¥ │ ¢ │ ˇ │ ¯ │ ‚ │ ‘ │ ’ │ — │ ÷ │       │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
- * │     │   │   │   │   │   │   │   │   │   │   │ ‹ │ › │  ¦  │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
- * │      │   │ § │   │   │   │   │   │   │   │ · │ ¨ │        │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤
- * │        │   │   │   │   │   │   │   │   │   │ … │          │
- * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤
- * │    │    │    │                        │    │    │    │    │
- * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
- */
-        "ALGR(EU_TILD)": {
-            "key": "EU_DTIL",
-            "label": "~ (dead)",
-        }
-        "S(ALGR(EU_1))": {
-            "key": "EU_SUP1",
-            "label": "¹",
-        }
-        "S(ALGR(EU_2))": {
-            "key": "EU_SUP2",
-            "label": "²",
-        }
-        "S(ALGR(EU_3))": {
-            "key": "EU_SUP3",
-            "label": "³",
-        }
-        "ALGR(EU_DLR)": {
-            "key": "EU_YEN",
-            "label": "¥",
-        }
-        "S(EU_EURO)": {
-            "key": "EU_CENT",
-            "label": "¢",
-        }
-        "S(EU_DCIR)": {
-            "key": "EU_CARN",
-            "label": "ˇ (dead)",
-        }
-        "S(ALGR(EU_7))": {
-            "key": "EU_MACR",
-            "label": "¯ (dead)",
-        }
-        "S(EU_DLQU)": {
-            "key": "EU_SLQU",
-            "label": "‚",
-        }
-        "S(EU_LDQU)": {
-            "key": "EU_LSQU",
-            "label": "‘",
-        }
-        "S(EU_RDQU)": {
-            "key": "EU_RSQU",
-            "label": "’",
-        }
-        "S(EU_NDSH)": {
-            "key": "EU_MDSH",
-            "label": "—",
-        }
-        "S(EU_MUL)": {
-            "key": "EU_DIV",
-            "label": "÷",
-        }
-        "S(EU_LDAQ)": {
-            "key": "EU_LSAQ",
-            "label": "‹",
-        }
-        "S(EU_RDAQ)": {
-            "key": "EU_RSAQ",
-            "label": "›",
-        }
-        "S(ALGR(EU_BSLS))": {
-            "key": "EU_BRKP",
-            "label": "¦",
-        }
-        "S(ALGR(EU_S))": {
-            "key": "EU_SECT",
-            "label": "§",
-        }
-        "S(ALGR(EU_SCLN))": {
-            "key": "EU_MDDT",
-            "label": "·",
-        }
-        "ALGR(EU_DQUO)": {
-            "key": "EU_DIAE",
-            "label": "¨ (dead)",
-        }
-        "ALGR(EU_QUES)": {
-            "key": "EU_ELLP",
-            "label": "…",
-        }
-    }
-}

data/constants/keycodes/extras/keycodes_farsi_0.0.1.hjson

@@ -1,616 +0,0 @@
-{
-    "aliases": {
-/*
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
- * │   │ ۱ │ ۲ │ ۳ │ ۴ │ ۵ │ ۶ │ ۷ │ ۸ │ ۹ │ ۰ │ - │ = │       │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
- * │     │ ض │ ص │ ث │ ق │ ف │ غ │ ع │ ه │ خ │ ح │ ج │ چ │     │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐    │
- * │      │ ش │ س │ ی │ ب │ ل │ ا │ ت │ ن │ م │ ک │ گ │ \ │    │
- * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤
- * │    │ < │ ظ │ ط │ ز │ ر │ ذ │ د │ پ │ و │ . │ / │          │
- * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤
- * │    │    │    │                        │    │    │    │    │
- * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
- */
-        "KC_GRV": {
-            "key": "FA_ZWJ",
-            "label": "(zero-width joiner)",
-        }
-        "KC_1": {
-            "key": "FA_1A",
-            "label": "۱",
-        }
-        "KC_2": {
-            "key": "FA_2A",
-            "label": "۲",
-        }
-        "KC_3": {
-            "key": "FA_3A",
-            "label": "۳",
-        }
-        "KC_4": {
-            "key": "FA_4A",
-            "label": "۴",
-        }
-        "KC_5": {
-            "key": "FA_5A",
-            "label": "۵",
-        }
-        "KC_6": {
-            "key": "FA_6A",
-            "label": "۶",
-        }
-        "KC_7": {
-            "key": "FA_7A",
-            "label": "۷",
-        }
-        "KC_8": {
-            "key": "FA_8A",
-            "label": "۸",
-        }
-        "KC_9": {
-            "key": "FA_9A",
-            "label": "۹",
-        }
-        "KC_0": {
-            "key": "FA_0A",
-            "label": "۰",
-        }
-        "KC_MINS": {
-            "key": "FA_MINS",
-            "label": "-",
-        }
-        "KC_EQL": {
-            "key": "FA_EQL",
-            "label": "=",
-        }
-        "KC_Q": {
-            "key": "FA_ZAD",
-            "label": "ض",
-        }
-        "KC_W": {
-            "key": "FA_SAD",
-            "label": "ص",
-        }
-        "KC_E": {
-            "key": "FA_SE",
-            "label": "ث",
-        }
-        "KC_R": {
-            "key": "FA_QAF",
-            "label": "ق",
-        }
-        "KC_T": {
-            "key": "FA_FE",
-            "label": "ف",
-        }
-        "KC_Y": {
-            "key": "FA_GHYN",
-            "label": "غ",
-        }
-        "KC_U": {
-            "key": "FA_EYN",
-            "label": "ع",
-        }
-        "KC_I": {
-            "key": "FA_HE",
-            "label": "ه",
-        }
-        "KC_O": {
-            "key": "FA_KHE",
-            "label": "خ",
-        }
-        "KC_P": {
-            "key": "FA_HEJ",
-            "label": "ح",
-        }
-        "KC_LBRC": {
-            "key": "FA_JIM",
-            "label": "ج",
-        }
-        "KC_RBRC": {
-            "key": "FA_CHE",
-            "label": "چ",
-        }
-        "KC_A": {
-            "key": "FA_SHIN",
-            "label": "ش",
-        }
-        "KC_S": {
-            "key": "FA_SIN",
-            "label": "س",
-        }
-        "KC_D": {
-            "key": "FA_YE",
-            "label": "ی",
-        }
-        "KC_F": {
-            "key": "FA_BE",
-            "label": "ب",
-        }
-        "KC_G": {
-            "key": "FA_LAM",
-            "label": "ل",
-        }
-        "KC_H": {
-            "key": "FA_ALEF",
-            "label": "ا",
-        }
-        "KC_J": {
-            "key": "FA_TE",
-            "label": "ت",
-        }
-        "KC_K": {
-            "key": "FA_NOON",
-            "label": "ن",
-        }
-        "KC_L": {
-            "key": "FA_MIM",
-            "label": "م",
-        }
-        "KC_SCLN": {
-            "key": "FA_KAF",
-            "label": "ک",
-        }
-        "KC_QUOT": {
-            "key": "FA_GAF",
-            "label": "گ",
-        }
-        "KC_BSLS": {
-            "key": "FA_BSLS",
-            "label": "\\",
-        }
-        "KC_LT": {
-            "key": "FA_LT",
-            "label": "<",
-        }
-        "KC_Z": {
-            "key": "FA_ZA",
-            "label": "ظ",
-        }
-        "KC_X": {
-            "key": "FA_TA",
-            "label": "ط",
-        }
-        "KC_C": {
-            "key": "FA_ZE",
-            "label": "ز",
-        }
-        "KC_V": {
-            "key": "FA_RE",
-            "label": "ر",
-        }
-        "KC_B": {
-            "key": "FA_ZAL",
-            "label": "ذ",
-        }
-        "KC_N": {
-            "key": "FA_DAL",
-            "label": "د",
-        }
-        "KC_M": {
-            "key": "FA_PE",
-            "label": "پ",
-        }
-        "KC_COMM": {
-            "key": "FA_WAW",
-            "label": "و",
-        }
-        "KC_DOT": {
-            "key": "FA_DOT",
-            "label": ".",
-        }
-        "KC_SLSH": {
-            "key": "FA_SLSH",
-            "label": "/",
-        }
-        "KC_SPC": {
-            "key": "FA_SPC",
-            "label": " ",
-        }
-/* Shifted symbols
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
- * │ ÷ │ ! │ ٬ │ ٫ │ ﷼ │ ٪ │ × │ ، │ * │ ) │ ( │ ـ │ + │       │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
- * │     │  ْ │  ٌ │  ٍ │  ً │  ُ │  ِ │  َ │  ّ │ ] │ [ │ } │ { │     │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐    │
- * │      │ ؤ │ ئ │ ي │ إ │ أ │ آ │ ة │ » │ « │ : │ ؛ │ | │    │
- * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤
- * │    │ > │ ك │  ٓ │ ژ │ ٰ  │   │  ٔ │ ء │   │   │ ؟ │          │
- * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤
- * │    │    │    │                        │    │    │    │    │
- * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
- */
-        "S(FA_ZWJ)": {
-            "key": "FA_DIV",
-            "label": "÷",
-        }
-        "S(FA_1A)": {
-            "key": "FA_EXLM",
-            "label": "!",
-        }
-        "S(FA_2A)": {
-            "key": "FA_THS",
-            "label": "٬",
-        }
-        "S(FA_3A)": {
-            "key": "FA_DECS",
-            "label": "٫",
-        }
-        "S(FA_4A)": {
-            "key": "FA_RIAL",
-            "label": "﷼",
-        }
-        "S(FA_5A)": {
-            "key": "FA_PRCA",
-            "label": "٪",
-        }
-        "S(FA_6A)": {
-            "key": "FA_MUL",
-            "label": "×",
-        }
-        "S(FA_7A)": {
-            "key": "FA_COMA",
-            "label": "،",
-        }
-        "S(FA_8A)": {
-            "key": "FA_ASTR",
-            "label": "*",
-        }
-        "S(FA_9A)": {
-            "key": "FA_RPRN",
-            "label": ")",
-        }
-        "S(FA_0A)": {
-            "key": "FA_LPRN",
-            "label": "(",
-        }
-        "S(FA_MINS)": {
-            "key": "FA_TATW",
-            "label": "ـ",
-        }
-        "S(FA_EQL)": {
-            "key": "FA_PLUS",
-            "label": "+",
-        }
-        "S(FA_ZAD)": {
-            "key": "FA_SUK",
-            "label": "ْ",
-        }
-        "S(FA_SAD)": {
-            "key": "FA_DMTN",
-            "label": "ٌ",
-        }
-        "S(FA_SE)": {
-            "key": "FA_KSTN",
-            "label": "ٍ",
-        }
-        "S(FA_QAF)": {
-            "key": "FA_FTHN",
-            "label": "ً",
-        }
-        "S(FA_FE)": {
-            "key": "FA_DMM",
-            "label": "ُ",
-        }
-        "S(FA_GHYN)": {
-            "key": "FA_KAS",
-            "label": "ِ",
-        }
-        "S(FA_EYN)": {
-            "key": "FA_FAT",
-            "label": "َ",
-        }
-        "S(FA_HE)": {
-            "key": "FA_TSDD",
-            "label": "",
-        }
-        "S(FA_KHE)": {
-            "key": "FA_RBRC",
-            "label": "]",
-        }
-        "S(FA_HEJ)": {
-            "key": "FA_LBRC",
-            "label": "[",
-        }
-        "S(FA_JIM)": {
-            "key": "FA_RCBR",
-            "label": "}",
-        }
-        "S(FA_CHE)": {
-            "key": "FA_LCBR",
-            "label": "{",
-        }
-        "S(FA_SHIN)": {
-            "key": "FA_HMZV",
-            "label": "ؤ",
-        }
-        "S(FA_SIN)": {
-            "key": "FA_HMZY",
-            "label": "ئ",
-        }
-        "S(FA_YE)": {
-            "key": "FA_YEA",
-            "label": "ي",
-        }
-        "S(FA_BE)": {
-            "key": "FA_HMZU",
-            "label": "إ",
-        }
-        "S(FA_LAM)": {
-            "key": "FA_HMZO",
-            "label": "أ",
-        }
-        "S(FA_ALEF)": {
-            "key": "FA_MALF",
-            "label": "آ",
-        }
-        "S(FA_TE)": {
-            "key": "FA_TEHM",
-            "label": "ة",
-        }
-        "S(FA_NOON)": {
-            "key": "FA_RQOT",
-            "label": "»",
-        }
-        "S(FA_MIM)": {
-            "key": "FA_LQOT",
-            "label": "«",
-        }
-        "S(FA_KAF)": {
-            "key": "FA_COLN",
-            "label": ":",
-        }
-        "S(FA_GAF)": {
-            "key": "FA_SCLA",
-            "label": "؛",
-        }
-        "S(FA_LT)": {
-            "key": "FA_GT",
-            "label": ">",
-        }
-        "S(FA_ZA)": {
-            "key": "FA_KAFA",
-            "label": "ك",
-        }
-        "S(FA_TA)": {
-            "key": "FA_MADO",
-            "label": "ٓ",
-        }
-        "S(FA_ZE)": {
-            "key": "FA_JEH",
-            "label": "ژ",
-        }
-        "S(FA_RE)": {
-            "key": "FA_SUPA",
-            "label": "ٰ",
-        }
-        "S(FA_ZAL)": {
-            "key": "FA_ZWNJ",
-            "label": "(zero-width non-joiner)",
-        }
-        "S(FA_DAL)": {
-            "key": "FA_HMZA",
-            "label": "ٔ",
-        }
-        "S(FA_PE)": {
-            "key": "FA_HMZ",
-            "label": "ء",
-        }
-        "S(FA_SLSH)": {
-            "key": "FA_QSA",
-            "label": "؟",
-        }
-/* AltGr symbols
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
- * │ ~ │ ` │ @ │ # │ $ │ % │ ^ │ & │ • │   │   │ _ │ − │       │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
- * │     │ ° │   │ € │   │   │   │   │   │   │   │   │   │     │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐    │
- * │      │   │   │ ى │   │   │ ٱ │   │ ﴾ │ ﴿ │ ; │ " │ ‐ │    │
- * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤
- * │    │ | │   │   │   │  ٖ │   │  ٕ │ … │ , │ ' │ ? │          │
- * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤
- * │    │    │    │                        │    │    │    │    │
- * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
- */
-        "ALGR(FA_ZWJ)": {
-            "key": "FA_TILD",
-            "label": "~",
-        }
-        "ALGR(FA_1A)": {
-            "key": "FA_GRV",
-            "label": "`",
-        }
-        "ALGR(FA_2A)": {
-            "key": "FA_AT",
-            "label": "@",
-        }
-        "ALGR(FA_3A)": {
-            "key": "FA_HASH",
-            "label": "#",
-        }
-        "ALGR(FA_4A)": {
-            "key": "FA_DLR",
-            "label": "$",
-        }
-        "ALGR(FA_5A)": {
-            "key": "FA_PERC",
-            "label": "%",
-        }
-        "ALGR(FA_6A)": {
-            "key": "FA_CIRC",
-            "label": "^",
-        }
-        "ALGR(FA_7A)": {
-            "key": "FA_AMPR",
-            "label": "&",
-        }
-        "ALGR(FA_8A)": {
-            "key": "FA_BULT",
-            "label": "•",
-        }
-        "ALGR(FA_9A)": {
-            "key": "FA_LRM",
-            "label": "(left-to-right mark)",
-        }
-        "ALGR(FA_0A)": {
-            "key": "FA_RLM",
-            "label": "(right-to-left mark)",
-        }
-        "ALGR(FA_MINS)": {
-            "key": "FA_UNDS",
-            "label": "_",
-        }
-        "ALGR(FA_EQL)": {
-            "key": "FA_DMNS",
-            "label": "− (dead)",
-        }
-        "ALGR(FA_ZAD)": {
-            "key": "FA_DEG",
-            "label": "°",
-        }
-        "ALGR(FA_SE)": {
-            "key": "FA_EURO",
-            "label": "€",
-        }
-        "ALGR(FA_HE)": {
-            "key": "FA_LRO",
-            "label": "(left-to-right override)",
-        }
-        "ALGR(FA_KHE)": {
-            "key": "FA_RLO",
-            "label": "(right-to-left override)",
-        }
-        "ALGR(FA_HEJ)": {
-            "key": "FA_PDF",
-            "label": "(pop directional formatting)",
-        }
-        "ALGR(FA_JIM)": {
-            "key": "FA_LRE",
-            "label": "(left-to-right embedding)",
-        }
-        "ALGR(FA_CHE)": {
-            "key": "FA_RLE",
-            "label": "(right-to-left embedding)",
-        }
-        "ALGR(FA_YE)": {
-            "key": "FA_ALFM",
-            "label": "ى",
-        }
-        "ALGR(FA_ALEF)": {
-            "key": "FA_ALFW",
-            "label": "ٱ",
-        }
-        "ALGR(FA_NOON)": {
-            "key": "FA_LORP",
-            "label": "﴾",
-        }
-        "ALGR(FA_MIM)": {
-            "key": "FA_RORP",
-            "label": "﴿",
-        }
-        "ALGR(FA_KAF)": {
-            "key": "FA_SCLN",
-            "label": ";",
-        }
-        "ALGR(FA_GAF)": {
-            "key": "FA_DQT",
-            "label": "\"",
-        }
-        "ALGR(FA_BSLS)": {
-            "key": "FA_MINA",
-            "label": "-",
-        }
-        "ALGR(FA_ZA)": {
-            "key": "FA_PIPE",
-            "label": "|",
-        }
-        "ALGR(FA_RE)": {
-            "key": "FA_SUBA",
-            "label": "ٖ",
-        }
-        "ALGR(FA_DAL)": {
-            "key": "FA_HMZB",
-            "label": "ء",
-        }
-        "ALGR(FA_PE)": {
-            "key": "FA_ELLP",
-            "label": "…",
-        }
-        "ALGR(FA_WAW)": {
-            "key": "FA_COMM",
-            "label": ",",
-        }
-        "ALGR(FA_DOT)": {
-            "key": "FA_QUOT",
-            "label": "'",
-        }
-        "ALGR(FA_SLSH)": {
-            "key": "FA_QUES",
-            "label": "?",
-        }
-/* Shift+AltGr symbols
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
- * │   │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │   │   │       │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
- * │     │   │   │   │   │   │   │   │   │   │   │   │   │     │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐    │
- * │      │   │   │   │   │   │   │   │   │   │   │   │   │    │
- * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤
- * │    │ ¦ │   │   │   │   │   │   │   │   │   │   │          │
- * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤
- * │    │    │    │                        │    │    │    │    │
- * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
- */
-        "S(ALGR(FA_1A))": {
-            "key": "FA_1",
-            "label": "1",
-        }
-        "S(ALGR(FA_2A))": {
-            "key": "FA_2",
-            "label": "2",
-        }
-        "S(ALGR(FA_3A))": {
-            "key": "FA_3",
-            "label": "3",
-        }
-        "S(ALGR(FA_4A))": {
-            "key": "FA_4",
-            "label": "4",
-        }
-        "S(ALGR(FA_5A))": {
-            "key": "FA_5",
-            "label": "5",
-        }
-        "S(ALGR(FA_6A))": {
-            "key": "FA_6",
-            "label": "6",
-        }
-        "S(ALGR(FA_7A))": {
-            "key": "FA_7",
-            "label": "7",
-        }
-        "S(ALGR(FA_8A))": {
-            "key": "FA_8",
-            "label": "8",
-        }
-        "S(ALGR(FA_9A))": {
-            "key": "FA_9",
-            "label": "9",
-        }
-        "S(ALGR(FA_0A))": {
-            "key": "FA_0",
-            "label": "0",
-        }
-        "S(ALGR(FA_LT))": {
-            "key": "FA_BRKP",
-            "label": "¦",
-        }
-        "S(ALGR(FA_SPC))": {
-            "key": "FA_NNBS",
-            "label": "(narrow non-breaking space)",
-        }
-    }
-}

data/constants/keycodes/extras/keycodes_finnish_0.0.1.hjson

@@ -356,4 +356,4 @@
             "label": "µ",
         }
     }
-}
+}

data/constants/keycodes/extras/keycodes_french_0.0.1.hjson

@@ -364,4 +364,4 @@
             "label": "¤",
         }
     }
-}
+}

data/constants/keycodes/extras/keycodes_french_afnor_0.0.1.hjson

@@ -620,4 +620,4 @@
             "label": "≠",
         }
     }
-}
+}

data/constants/keycodes/extras/keycodes_french_mac_iso_0.0.1.hjson

@@ -673,4 +673,4 @@
             "label": "±",
         }
     }
-}
+}

data/constants/keycodes/extras/keycodes_german_0.0.1.hjson

@@ -356,4 +356,4 @@
             "label": "µ",
         }
     }
-}
+}

data/constants/keycodes/extras/keycodes_german_mac_iso_0.0.1.hjson

@@ -653,4 +653,4 @@
             "label": "—",
         }
     }
-}
+}

data/constants/keycodes/extras/keycodes_greek_0.0.1.hjson

@@ -388,4 +388,4 @@
             "label": "©",
         }
     }
-}
+}

data/constants/keycodes/extras/keycodes_hebrew_0.0.1.hjson

@@ -344,4 +344,4 @@
             "label": "÷",
         }
     }
-}
+}

data/constants/keycodes/extras/keycodes_hungarian_0.0.1.hjson

@@ -432,4 +432,4 @@
             "label": "*",
         }
     }
-}
+}

data/constants/keycodes/extras/keycodes_icelandic_0.0.1.hjson

@@ -352,4 +352,4 @@
             "label": "µ",
         }
     }
-}
+}

data/constants/keycodes/extras/keycodes_irish_0.0.1.hjson

@@ -352,4 +352,4 @@
             "label": "´ (dead)",
         }
     }
-}
+}

data/constants/keycodes/extras/keycodes_italian_0.0.1.hjson

@@ -361,4 +361,4 @@
             "label": "}",
         }
     }
-}
+}

data/constants/keycodes/extras/keycodes_italian_mac_ansi_0.0.1.hjson

@@ -681,4 +681,4 @@
             "label": "—",
         }
     }
-}
+}

data/constants/keycodes/extras/keycodes_italian_mac_iso_0.0.1.hjson

@@ -685,4 +685,4 @@
             "label": "—",
         }
     }
-}
+}

data/constants/keycodes/extras/keycodes_japanese_0.0.1.hjson

@@ -327,4 +327,4 @@
             "label": "_",
         }
     }
-}
+}

data/constants/keycodes/extras/keycodes_korean_0.0.1.hjson

@@ -307,4 +307,4 @@
             "label": "?",
         }
     }
-}
+}

data/constants/keycodes/extras/keycodes_latvian_0.0.1.hjson

@@ -437,4 +437,4 @@
             "label": "¨ (dead)",
         }
     }
-}
+}

data/constants/keycodes/extras/keycodes_lithuanian_azerty_0.0.1.hjson

@@ -372,4 +372,4 @@
             "label": "\\",
         }
     }
-}
+}

data/constants/keycodes/extras/keycodes_lithuanian_qwerty_0.0.1.hjson

@@ -365,4 +365,4 @@
             "label": "+",
         }
     }
-}
+}

data/constants/keycodes/extras/keycodes_neo2_0.0.1.hjson

@@ -214,4 +214,4 @@
             "label": "(layer 4)",
         }
     }
-}
+}

data/constants/keycodes/extras/keycodes_nordic_0.0.1.hjson

@@ -113,4 +113,4 @@
             "key": "NO_MU"
         }
     }
-}
+}

data/constants/keycodes/extras/keycodes_norman_0.0.1.hjson

@@ -299,4 +299,4 @@
             "label": "?",
         }
     }
-}
+}

data/constants/keycodes/extras/keycodes_norwegian_0.0.1.hjson

@@ -352,4 +352,4 @@
             "label": "µ",
         }
     }
-}
+}

data/constants/keycodes/extras/keycodes_plover_0.0.1.hjson

@@ -83,4 +83,4 @@
             "key": "PV_U"
         }
     }
-}
+}

data/constants/keycodes/extras/keycodes_plover_dvorak_0.0.1.hjson

@@ -70,4 +70,4 @@
             "key": "PD_U"
         }
     }
-}
+}

data/constants/keycodes/extras/keycodes_polish_0.0.1.hjson

@@ -352,4 +352,4 @@
             "label": "Ń",
         }
     }
-}
+}

data/constants/keycodes/extras/keycodes_portuguese_0.0.1.hjson

@@ -352,4 +352,4 @@
             "label": "€",
         }
     }
-}
+}

data/constants/keycodes/extras/keycodes_portuguese_mac_iso_0.0.1.hjson

@@ -617,4 +617,4 @@
             "label": "–",
         }
     }
-}
+}

data/constants/keycodes/extras/keycodes_romanian_0.0.1.hjson

@@ -441,4 +441,4 @@
             "label": "»",
         }
     }
-}
+}

data/constants/keycodes/extras/keycodes_russian_0.0.1.hjson

@@ -288,4 +288,4 @@
             "label": "₽",
         }
     }
-}
+}

data/constants/keycodes/extras/keycodes_serbian_0.0.1.hjson

@@ -304,4 +304,4 @@
             "label": "€",
         }
     }
-}
+}

data/constants/keycodes/extras/keycodes_serbian_latin_0.0.1.hjson

@@ -404,4 +404,4 @@
             "label": "§",
         }
     }
-}
+}

data/constants/keycodes/extras/keycodes_slovak_0.0.1.hjson

@@ -440,4 +440,4 @@
             "label": "}",
         }
     }
-}
+}

data/constants/keycodes/extras/keycodes_slovenian_0.0.1.hjson

@@ -400,4 +400,4 @@
             "label": "§",
         }
     }
-}
+}

data/constants/keycodes/extras/keycodes_spanish_0.0.1.hjson

@@ -356,4 +356,4 @@
             "label": "}",
         }
     }
-}
+}

data/constants/keycodes/extras/keycodes_spanish_dvorak_0.0.1.hjson

@@ -356,4 +356,4 @@
             "label": "}",
         }
     }
-}
+}

data/constants/keycodes/extras/keycodes_spanish_latin_america_0.0.1.hjson

@@ -340,4 +340,4 @@
             "label": "`",
         }
     }
-}
+}

data/constants/keycodes/extras/keycodes_swedish_0.0.1.hjson

@@ -356,4 +356,4 @@
             "label": "µ",
         }
     }
-}
+}

data/constants/keycodes/extras/keycodes_swedish_mac_ansi_0.0.1.hjson

@@ -639,4 +639,4 @@
             "label": "—",
         }
     }
-}
+}

data/constants/keycodes/extras/keycodes_swedish_mac_iso_0.0.1.hjson

@@ -637,4 +637,4 @@
             "label": "—",
         }
     }
-}
+}