fix: ignore $schema when create schema

Voxelum · Jul 15, 2019 · 881e190 · 881e190
1 parent c823422
commit 881e190
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 16 deletions.
diff --git a/scripts/build-locale.js b/scripts/build-locale.js
@@ -8,6 +8,8 @@ const files = fs.readdirSync(base).filter(f => f.endsWith('.json')).map(f => pat
 function discover(dest, src) {
     const keys = Object.keys(src);
     for (const k of keys) {
+        // eslint-disable-next-line no-continue
+        if (k === '$schema') continue;
         const v = src[k];
         if (typeof v === 'object') {
             if (!dest[k]) {

diff --git a/static/locale.schema.json b/static/locale.schema.json
@@ -1,9 +1,6 @@
 {
     "type": "object",
     "properties": {
-        "$schema": {
-            "type": "string"
-        },
         "!delete": {
             "type": "string"
         },
@@ -1981,45 +1978,45 @@
                 "": {
                     "type": "string"
                 },
-                "installLibraries": {
+                "installAssets": {
                     "type": "object",
                     "properties": {
                         "": {
                             "type": "string"
                         },
-                        "library": {
+                        "assets": {
+                            "type": "string"
+                        },
+                        "assetsJson": {
                             "type": "string"
                         }
                     },
                     "required": [
                         "",
-                        "library"
+                        "assets",
+                        "assetsJson"
                     ]
                 },
-                "installAssets": {
+                "installLibraries": {
                     "type": "object",
                     "properties": {
                         "": {
                             "type": "string"
                         },
-                        "assets": {
-                            "type": "string"
-                        },
-                        "assetsJson": {
+                        "library": {
                             "type": "string"
                         }
                     },
                     "required": [
                         "",
-                        "assets",
-                        "assetsJson"
+                        "library"
                     ]
                 }
             },
             "required": [
                 "",
-                "installLibraries",
-                "installAssets"
+                "installAssets",
+                "installLibraries"
             ]
         },
         "installJre": {
@@ -2678,7 +2675,6 @@
         }
     },
     "required": [
-        "$schema",
         "!delete",
         "Invalid credentials. Invalid username or password.",
         "acceptingMinecraftVersion",