Merge remote-tracking branch 'origin/develop' into xap

2024-08-26 04:25:39 +01:00 · 2024-08-26 04:25:39 +01:00 · 7b8bf3426d
commit 7b8bf3426d
parent 6865a727a8 0c43a15ce6
5938 changed files with 4453 additions and 154018 deletions
--- a/lib/python/qmk/cli/format/json.py
+++ b/lib/python/qmk/cli/format/json.py
@ -18,11 +18,18 @@ def _detect_json_format(file, json_data):
    """
    json_encoder = None
    try:
-        validate(json_data, 'qmk.user_repo.v1')
+        validate(json_data, 'qmk.user_repo.v1_1')
        json_encoder = UserspaceJSONEncoder
    except ValidationError:
        pass

+    if json_encoder is None:
+        try:
+            validate(json_data, 'qmk.user_repo.v1')
+            json_encoder = UserspaceJSONEncoder
+        except ValidationError:
+            pass
+
    if json_encoder is None:
        try:
            validate(json_data, 'qmk.keyboard.v1')