Fix develop (#12039)

Fixes file encoding errors on Windows, and layouts not correctly merging into info.json. * force utf8 encoding * correctly merge layouts and layout aliases * show what aliases point to
2021-02-27 12:00:50 -08:00
parent 23ed6c4ec0
commit 1581ea48dc
10 changed files with 66 additions and 32 deletions
--- a/data/schemas/keyboard.jsonschema
+++ b/data/schemas/keyboard.jsonschema
@@ -85,8 +85,16 @@
        "layout_aliases": {
            "type": "object",
            "additionalProperties": {
-                "type": "string",
-                "pattern": "^LAYOUT_[0-9a-z_]*$"
+                "oneOf": [
+                    {
+                        "type": "string",
+                        "enum": ["LAYOUT"]
+                    },
+                    {
+                        "type": "string",
+                        "pattern": "^LAYOUT_[0-9a-z_]*$"
+                    }
+                ]
            }
        },
        "layouts": {