Merge release/11.1.0-rc into cascading/11.1.0-rc-main

AmadeusITGroup · Aug 8, 2024 · 4d0544a · 4d0544a
2 parents 82dfc6e + 82e1a7b
commit 4d0544a
Showing 1 changed file with 7 additions and 21 deletions.
diff --git a/packages/@o3r/design/schemas/design-token.schema.json b/packages/@o3r/design/schemas/design-token.schema.json
@@ -78,7 +78,6 @@
       }
     },
     "extensions": {
-      "type": "object",
       "allOf": [
         {
           "$ref": "#/definitions/otterExtension"
@@ -190,16 +189,12 @@
       }
     },
     "tokenTypeFontFamily": {
-      "type": "object",
-      "required": [
-        "$type",
-        "primary"
-      ],
       "allOf": [
         {
           "oneOf": [
             {
               "type": "object",
+              "required": ["$value"],
               "properties": {
                 "$value": {
                   "type": "string"
@@ -238,6 +233,9 @@
         },
         {
           "type": "object",
+          "required": [
+            "$type"
+          ],
           "properties": {
             "$type": {
               "const": "fontFamily",
@@ -257,9 +255,7 @@
           "type": "string",
           "pattern": "^.*\\{.*\\}.*$"
         },
-        "$type": {
-          "not": {}
-        }
+        "$type": false
       }
     },
     "tokenTypeDuration": {
@@ -303,14 +299,7 @@
       }
     },
     "tokenTypeFontWeightValue": {
-      "oneOf": [
-        {
-          "type": "number"
-        },
-        {
-          "type": "string"
-        }
-      ]
+      "type": ["string", "number"]
     },
     "tokenTypeFontWeight": {
       "type": "object",
@@ -599,10 +588,7 @@
               "$ref": "#/definitions/tokenTypeFontWeightValue"
             },
             "lineHeight": {
-              "oneOf": [
-                { "type": "string" },
-                { "type": "number" }
-              ]
+              "type": ["string", "number"]
             }
           },
           "required": [