Merge branch 'master' into on-demand-schema-loading

package-lock.json

@@ -74,21 +74,21 @@
       }
     },
     "vscode-json-languageservice": {
-      "version": "3.1.4",
+      "version": "3.1.5",
-      "resolved": "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-3.1.4.tgz",
+      "resolved": "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-3.1.5.tgz",
-      "integrity": "sha512-RiLEhif0MzwIscoxKZ0lL1fvKUbB1DLJcPXGCm/K9WouLbEQu1OuIBsMPp3NnK+ZOW7uMXZgGfpMtWow7YgOiQ==",
+      "integrity": "sha512-mUb8EUADnBOf8PM9LSx4dVoSc9fY6sh+MXAD0vxqHPI58RpbvvxWQkTDAbnJDFJZbq+9q3NrY7qenLF/YCXREg==",
       "dev": true,
       "requires": {
         "jsonc-parser": "2.0.1",
-        "vscode-languageserver-types": "3.10.0",
+        "vscode-languageserver-types": "3.10.1",
         "vscode-nls": "3.2.4",
         "vscode-uri": "1.0.5"
       }
     },
     "vscode-languageserver-types": {
-      "version": "3.10.0",
+      "version": "3.10.1",
-      "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.10.0.tgz",
+      "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.10.1.tgz",
-      "integrity": "sha512-vxmCsVZGwq8X40SuLP8Ix7V0rq5V/7iQUjRVe2Oxm+TbmjxtjK4dpHHXQCUawjA4fhPA9FwjSRbDhbvQmYCfMw==",
+      "integrity": "sha512-HeQ1BPYJDly4HfKs0h2TUAZyHfzTAhgQsCwsa1tW9PhuvGGsd2r3Q53FFVugwP7/2bUv3GWPoTgAuIAkIdBc4w==",
       "dev": true
     },
     "vscode-nls": {

package.json

@@ -26,7 +26,7 @@
     "requirejs": "^2.3.5",
     "typescript": "3.0.1",
     "uglify-js": "^3.4.7",
-    "vscode-json-languageservice": "3.1.4",
+    "vscode-json-languageservice": "3.1.5",
-    "vscode-languageserver-types": "3.10.0"
+    "vscode-languageserver-types": "3.10.1"
   }
 }