Merge from master

extensions/json/.vscodeignore

@@ -1 +1,3 @@
-test/**
+build/**
+test/**
+cgmanifest.json

extensions/json/OSSREADME.json

@@ -1,7 +0,0 @@
-// ATTENTION - THIS DIRECTORY CONTAINS THIRD PARTY OPEN SOURCE MATERIALS:
-[{
-	"name": "Microsoft/vscode-JSON.tmLanguage",
-	"version": "0.0.0",
-	"license": "MIT",
-	"repositoryURL": "https://github.com/Microsoft/vscode-JSON.tmLanguage"
-}]

extensions/json/cgmanifest.json

@@ -0,0 +1,17 @@
+{
+	"registrations": [
+		{
+			"component": {
+				"type": "git",
+				"git": {
+					"name": "Microsoft/vscode-JSON.tmLanguage",
+					"repositoryUrl": "https://github.com/Microsoft/vscode-JSON.tmLanguage",
+					"commitHash": "9bd83f1c252b375e957203f21793316203f61f70"
+				}
+			},
+			"license": "MIT",
+			"version": "0.0.0"
+		}
+	],
+	"version": 1
+}

extensions/json/package.json

@@ -24,7 +24,6 @@
           ".jshintrc",
           ".jscsrc",
           ".eslintrc",
-          ".babelrc",
           ".webmanifest",
           ".js.map",
           ".css.map"
@@ -45,6 +44,8 @@
           "JSON with Comments"
         ],
         "extensions": [
+          ".hintrc",
+          ".babelrc",
           ".jsonc"
         ],
         "configuration": "./language-configuration.json"
@@ -65,7 +66,7 @@
     "jsonValidation": [
       {
         "fileMatch": "*.schema.json",
-        "url": "http://json-schema.org/draft-04/schema#"
+        "url": "http://json-schema.org/draft-07/schema#"
       }
     ]
   }