refactor: add correct schema keys

alan-agius4 · clydin · commit 076ab0f11fe6 · 2021-04-13T10:51:12.000-04:00
With this change - We replace `id` with `$id`, this no longer valid in draft-07. - Replace all `$schemas` to `http://json-schema.org/draft-07/schema`, this is needed to "pin" the schema to `draft-07`. More information about `draft-07` can be found https://json-schema.org/draft-07/json-schema-release-notes.html
diff --git a/packages/angular/cli/commands/add.json b/packages/angular/cli/commands/add.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "ng-cli://commands/add.json",
   "description": "Adds support for an external library to your project.",
   "$longDescription": "./add.md",
diff --git a/packages/angular/cli/commands/analytics.json b/packages/angular/cli/commands/analytics.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "ng-cli://commands/analytics.json",
   "description": "Configures the gathering of Angular CLI usage metrics. See https://angular.io/cli/usage-analytics-gathering.",
   "$longDescription": "./analytics-long.md",
diff --git a/packages/angular/cli/commands/build.json b/packages/angular/cli/commands/build.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "ng-cli://commands/build.json",
   "description": "Compiles an Angular app into an output directory named dist/ at the given output path. Must be executed from within a workspace directory.",
   "$longDescription": "./build-long.md",
diff --git a/packages/angular/cli/commands/config.json b/packages/angular/cli/commands/config.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "ng-cli://commands/config.json",
   "description": "Retrieves or sets Angular configuration values in the angular.json file for the workspace.",
   "$longDescription": "",
diff --git a/packages/angular/cli/commands/definitions.json b/packages/angular/cli/commands/definitions.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "ng-cli://commands/definitions.json",
 
   "definitions": {
@@ -38,6 +38,7 @@
       }
     },
     "schematic": {
+      "type": "object",
       "properties": {
         "dryRun": {
           "type": "boolean",
@@ -54,6 +55,7 @@
       }
     },
     "interactive": {
+      "type": "object",
       "properties": {
         "interactive": {
           "type": "boolean",
diff --git a/packages/angular/cli/commands/deploy.json b/packages/angular/cli/commands/deploy.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "ng-cli://commands/deploy.json",
   "description": "Invokes the deploy builder for a specified project or for the default project in the workspace.",
   "$longDescription": "./deploy-long.md",
diff --git a/packages/angular/cli/commands/doc.json b/packages/angular/cli/commands/doc.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "ng-cli://commands/doc.json",
   "description": "Opens the official Angular documentation (angular.io) in a browser, and searches for a given keyword.",
   "$longDescription": "",
diff --git a/packages/angular/cli/commands/e2e.json b/packages/angular/cli/commands/e2e.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "ng-cli://commands/e2e.json",
   "description": "Builds and serves an Angular app, then runs end-to-end tests using Protractor.",
   "$longDescription": "./e2e-long.md",
diff --git a/packages/angular/cli/commands/easter-egg.json b/packages/angular/cli/commands/easter-egg.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "ng-cli://commands/easter-egg.json",
   "description": "",
   "$longDescription": "",
diff --git a/packages/angular/cli/commands/extract-i18n.json b/packages/angular/cli/commands/extract-i18n.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "ng-cli://commands/extract-i18n.json",
   "description": "Extracts i18n messages from source code.",
   "$longDescription": "",
diff --git a/packages/angular/cli/commands/generate.json b/packages/angular/cli/commands/generate.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "ng-cli://commands/generate.json",
   "description": "Generates and/or modifies files based on a schematic.",
   "$longDescription": "",
diff --git a/packages/angular/cli/commands/help.json b/packages/angular/cli/commands/help.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "ng-cli://commands/help.json",
   "description": "Lists available commands and their short descriptions.",
   "$longDescription": "./help-long.md",
diff --git a/packages/angular/cli/commands/lint.json b/packages/angular/cli/commands/lint.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "ng-cli://commands/lint.json",
   "description": "Runs linting tools on Angular app code in a given project folder.",
   "$longDescription": "./lint-long.md",
diff --git a/packages/angular/cli/commands/new.json b/packages/angular/cli/commands/new.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "ng-cli://commands/new.json",
   "description": "Creates a new workspace and an initial Angular application.",
   "$longDescription": "./new.md",
diff --git a/packages/angular/cli/commands/run.json b/packages/angular/cli/commands/run.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "ng-cli://commands/run.json",
   "description": "Runs an Architect target with an optional custom builder configuration defined in your project.",
   "$longDescription": "./run-long.md",
diff --git a/packages/angular/cli/commands/serve.json b/packages/angular/cli/commands/serve.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "ng-cli://commands/serve.json",
   "description": "Builds and serves your app, rebuilding on file changes.",
   "$longDescription": "",
diff --git a/packages/angular/cli/commands/test.json b/packages/angular/cli/commands/test.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "ng-cli://commands/test.json",
   "description": "Runs unit tests in a project.",
   "$longDescription": "./test-long.md",
diff --git a/packages/angular/cli/commands/update.json b/packages/angular/cli/commands/update.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "ng-cli://commands/update.json",
   "description": "Updates your application and its dependencies. See https://update.angular.io/",
   "$longDescription": "./update-long.md",
diff --git a/packages/angular/cli/commands/version.json b/packages/angular/cli/commands/version.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "ng-cli://commands/version.json",
   "description": "Outputs Angular CLI version.",
   "$longDescription": "",
diff --git a/packages/angular/cli/src/commands/update/schematic/schema.json b/packages/angular/cli/src/commands/update/schematic/schema.json
@@ -1,6 +1,6 @@
 {
-  "$schema": "http://json-schema.org/schema",
-  "id": "SchematicsUpdateSchema",
+  "$schema": "http://json-schema.org/draft-07/schema",
+  "$id": "SchematicsUpdateSchema",
   "title": "Schematic Options Schema",
   "type": "object",
   "properties": {
diff --git a/packages/angular/pwa/pwa/schema.json b/packages/angular/pwa/pwa/schema.json
@@ -1,6 +1,6 @@
 {
-  "$schema": "http://json-schema.org/schema",
-  "id": "SchematicsAngularPWA",
+  "$schema": "http://json-schema.org/draft-07/schema",
+  "$id": "SchematicsAngularPWA",
   "title": "Angular PWA Options Schema",
   "type": "object",
   "properties": {
diff --git a/packages/angular_devkit/architect/builders/noop-schema.json b/packages/angular_devkit/architect/builders/noop-schema.json
@@ -1,4 +1,4 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "http://json-schema.org/draft-07/schema",
   "type": "object"
 }
diff --git a/packages/angular_devkit/architect/builders/operator-schema.json b/packages/angular_devkit/architect/builders/operator-schema.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "http://json-schema.org/draft-07/schema",
   "description": "All input types of builders that perform operations on one or multiple sub-builders.",
   "type": "object",
   "properties": {
diff --git a/packages/angular_devkit/architect/src/builders-schema.json b/packages/angular_devkit/architect/src/builders-schema.json
@@ -1,6 +1,6 @@
 {
-  "$schema": "http://json-schema.org/schema",
-  "id": "BuildersSchema",
+  "$schema": "http://json-schema.org/draft-07/schema",
+  "$id": "BuildersSchema",
   "title": "Builders schema for validating a list of builders.",
   "type": "object",
   "properties": {
diff --git a/packages/angular_devkit/architect/src/input-schema.json b/packages/angular_devkit/architect/src/input-schema.json
@@ -1,6 +1,6 @@
 {
-  "$schema": "http://json-schema.org/schema",
-  "id": "BuilderInputSchema",
+  "$schema": "http://json-schema.org/draft-07/schema",
+  "$id": "BuilderInputSchema",
   "title": "Input schema for builders.",
   "type": "object",
   "properties": {
diff --git a/packages/angular_devkit/architect/src/output-schema.json b/packages/angular_devkit/architect/src/output-schema.json
@@ -1,6 +1,6 @@
 {
-  "$schema": "http://json-schema.org/schema",
-  "id": "BuilderOutputSchema",
+  "$schema": "http://json-schema.org/draft-07/schema",
+  "$id": "BuilderOutputSchema",
   "title": "Output schema for builders.",
   "type": "object",
   "properties": {
diff --git a/packages/angular_devkit/architect/src/progress-schema.json b/packages/angular_devkit/architect/src/progress-schema.json
@@ -1,6 +1,6 @@
 {
-  "$schema": "http://json-schema.org/schema",
-  "id": "BuilderProgressSchema",
+  "$schema": "http://json-schema.org/draft-07/schema",
+  "$id": "BuilderProgressSchema",
   "title": "Progress schema for builders.",
   "type": "object",
   "allOf": [
diff --git a/packages/angular_devkit/architect/src/targets-schema.json b/packages/angular_devkit/architect/src/targets-schema.json
@@ -1,6 +1,6 @@
 {
-  "$schema": "http://json-schema.org/schema",
-  "id": "ArchitectTargets",
+  "$schema": "http://json-schema.org/draft-07/schema",
+  "$id": "ArchitectTargets",
   "title": "Targets schema for validating Architect targets configuration.",
   "type": "object",
   "description": "A map of available project targets.",
diff --git a/packages/angular_devkit/build_angular/src/browser/schema.json b/packages/angular_devkit/build_angular/src/browser/schema.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "http://json-schema.org/draft-07/schema",
   "title": "Webpack browser schema for Build Facade.",
   "description": "Browser target options",
   "type": "object",
@@ -14,8 +14,7 @@
     },
     "main": {
       "type": "string",
-      "description": "The full path for the main entry point to the app, relative to the current workspace.",
-      "$valueDescription": "fileName"
+      "description": "The full path for the main entry point to the app, relative to the current workspace."
     },
     "polyfills": {
       "type": "string",
diff --git a/packages/angular_devkit/build_angular/src/dev-server/schema.json b/packages/angular_devkit/build_angular/src/dev-server/schema.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "http://json-schema.org/draft-07/schema",
   "title": "Dev Server Target",
   "description": "Dev Server target options for Build Facade.",
   "type": "object",
diff --git a/packages/angular_devkit/build_angular/src/server/schema.json b/packages/angular_devkit/build_angular/src/server/schema.json
@@ -1,6 +1,6 @@
 {
-  "$schema": "http://json-schema.org/schema",
-  "id": "BuildAngularWebpackServerSchema",
+  "$schema": "http://json-schema.org/draft-07/schema",
+  "$id": "BuildAngularWebpackServerSchema",
   "title": "Universal Target",
   "type": "object",
   "properties": {
diff --git a/packages/angular_devkit/build_webpack/src/webpack-dev-server/schema.json b/packages/angular_devkit/build_webpack/src/webpack-dev-server/schema.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "http://json-schema.org/draft-07/schema",
   "title": "Webpack Dev-Server Builder",
   "description": "Webpack Dev-Server Builder schema for Architect.",
   "type": "object",
diff --git a/packages/angular_devkit/build_webpack/src/webpack/schema.json b/packages/angular_devkit/build_webpack/src/webpack/schema.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "http://json-schema.org/draft-07/schema",
   "title": "Webpack Builder.",
   "description": "Webpack Builder schema for Architect.",
   "type": "object",
diff --git a/packages/angular_devkit/schematics/collection-schema.json b/packages/angular_devkit/schematics/collection-schema.json
@@ -1,6 +1,6 @@
 {
-  "$schema": "http://json-schema.org/schema",
-  "id": "SchematicsCollectionSchema",
+  "$schema": "http://json-schema.org/draft-07/schema",
+  "$id": "SchematicsCollectionSchema",
   "title": "Collection Schema for validating a 'collection.json'.",
   "type": "object",
   "properties": {
diff --git a/packages/angular_devkit/schematics_cli/blank/schema.json b/packages/angular_devkit/schematics_cli/blank/schema.json
@@ -1,6 +1,6 @@
 {
-  "$schema": "http://json-schema.org/schema",
-  "id": "SchematicsSchematicSchema",
+  "$schema": "http://json-schema.org/draft-07/schema",
+  "$id": "SchematicsSchematicSchema",
   "title": "Schematic Options Schema",
   "type": "object",
   "properties": {
diff --git a/packages/angular_devkit/schematics_cli/schematic/files/src/my-full-schematic/schema.json b/packages/angular_devkit/schematics_cli/schematic/files/src/my-full-schematic/schema.json
@@ -1,6 +1,6 @@
 {
-  "$schema": "http://json-schema.org/schema",
-  "id": "MyFullSchematicsSchema",
+  "$schema": "http://json-schema.org/draft-07/schema",
+  "$id": "MyFullSchematicsSchema",
   "title": "My Full Schematics Schema",
   "type": "object",
   "properties": {
diff --git a/packages/angular_devkit/schematics_cli/schematic/schema.json b/packages/angular_devkit/schematics_cli/schematic/schema.json
@@ -1,6 +1,6 @@
 {
-  "$schema": "http://json-schema.org/schema",
-  "id": "SchematicsSchematicSchema",
+  "$schema": "http://json-schema.org/draft-07/schema",
+  "$id": "SchematicsSchematicSchema",
   "title": "Schematic Options Schema",
   "type": "object",
   "properties": {
diff --git a/packages/schematics/angular/app-shell/schema.json b/packages/schematics/angular/app-shell/schema.json
@@ -1,6 +1,6 @@
 {
-  "$schema": "http://json-schema.org/schema",
-  "id": "SchematicsAngularAppShell",
+  "$schema": "http://json-schema.org/draft-07/schema",
+  "$id": "SchematicsAngularAppShell",
   "title": "Angular AppShell Options Schema",
   "type": "object",
   "description": "Generates an app shell for running a server-side version of an app.",
diff --git a/packages/schematics/angular/application/schema.json b/packages/schematics/angular/application/schema.json
@@ -1,6 +1,6 @@
 {
-  "$schema": "http://json-schema.org/schema",
-  "id": "SchematicsAngularApp",
+  "$schema": "http://json-schema.org/draft-07/schema",
+  "$id": "SchematicsAngularApp",
   "title": "Angular Application Options Schema",
   "type": "object",
   "description": "Generates a new basic app definition in the \"projects\" subfolder of the workspace.",
diff --git a/packages/schematics/angular/class/schema.json b/packages/schematics/angular/class/schema.json
@@ -1,6 +1,6 @@
 {
-  "$schema": "http://json-schema.org/schema",
-  "id": "SchematicsAngularClass",
+  "$schema": "http://json-schema.org/draft-07/schema",
+  "$id": "SchematicsAngularClass",
   "title": "Angular Class Options Schema",
   "type": "object",
   "description": "Creates a new generic class definition in the given or default project.",
diff --git a/packages/schematics/angular/component/schema.json b/packages/schematics/angular/component/schema.json
@@ -1,6 +1,6 @@
 {
-  "$schema": "http://json-schema.org/schema",
-  "id": "SchematicsAngularComponent",
+  "$schema": "http://json-schema.org/draft-07/schema",
+  "$id": "SchematicsAngularComponent",
   "title": "Angular Component Options Schema",
   "type": "object",
   "description": "Creates a new generic component definition in the given or default project.",
diff --git a/packages/schematics/angular/directive/schema.json b/packages/schematics/angular/directive/schema.json
@@ -1,6 +1,6 @@
 {
-  "$schema": "http://json-schema.org/schema",
-  "id": "SchematicsAngularDirective",
+  "$schema": "http://json-schema.org/draft-07/schema",
+  "$id": "SchematicsAngularDirective",
   "title": "Angular Directive Options Schema",
   "type": "object",
   "description": "Creates a new generic directive definition in the given or default project.",
diff --git a/packages/schematics/angular/e2e/schema.json b/packages/schematics/angular/e2e/schema.json
@@ -1,6 +1,6 @@
 {
-  "$schema": "http://json-schema.org/schema",
-  "id": "SchematicsAngularE2eApp",
+  "$schema": "http://json-schema.org/draft-07/schema",
+  "$id": "SchematicsAngularE2eApp",
   "title": "Angular e2e Application Options Schema",
   "type": "object",
   "additionalProperties": false,
diff --git a/packages/schematics/angular/enum/schema.json b/packages/schematics/angular/enum/schema.json
@@ -1,6 +1,6 @@
 {
-  "$schema": "http://json-schema.org/schema",
-  "id": "SchematicsAngularEnum",
+  "$schema": "http://json-schema.org/draft-07/schema",
+  "$id": "SchematicsAngularEnum",
   "title": "Angular Enum Options Schema",
   "type": "object",
   "description": "Generates a new, generic enum definition for the given or default project.",
diff --git a/packages/schematics/angular/guard/schema.json b/packages/schematics/angular/guard/schema.json
@@ -1,6 +1,6 @@
 {
-  "$schema": "http://json-schema.org/schema",
-  "id": "SchematicsAngularGuard",
+  "$schema": "http://json-schema.org/draft-07/schema",
+  "$id": "SchematicsAngularGuard",
   "title": "Angular Guard Options Schema",
   "type": "object",
   "description": "Generates a new, generic route guard definition in the given or default project.",
diff --git a/packages/schematics/angular/interceptor/schema.json b/packages/schematics/angular/interceptor/schema.json
@@ -1,6 +1,6 @@
 {
-  "$schema": "http://json-schema.org/schema",
-  "id": "SchematicsAngularInterceptor",
+  "$schema": "http://json-schema.org/draft-07/schema",
+  "$id": "SchematicsAngularInterceptor",
   "title": "Angular Interceptor Options Schema",
   "type": "object",
   "additionalProperties": false,
diff --git a/packages/schematics/angular/interface/schema.json b/packages/schematics/angular/interface/schema.json
@@ -1,6 +1,6 @@
 {
-  "$schema": "http://json-schema.org/schema",
-  "id": "SchematicsAngularInterface",
+  "$schema": "http://json-schema.org/draft-07/schema",
+  "$id": "SchematicsAngularInterface",
   "title": "Angular Interface Options Schema",
   "type": "object",
   "additionalProperties": false,
diff --git a/packages/schematics/angular/library/schema.json b/packages/schematics/angular/library/schema.json
diff --git a/packages/schematics/angular/module/schema.json b/packages/schematics/angular/module/schema.json
diff --git a/packages/schematics/angular/ng-new/schema.json b/packages/schematics/angular/ng-new/schema.json
diff --git a/packages/schematics/angular/pipe/schema.json b/packages/schematics/angular/pipe/schema.json
diff --git a/packages/schematics/angular/resolver/schema.json b/packages/schematics/angular/resolver/schema.json
diff --git a/packages/schematics/angular/service-worker/schema.json b/packages/schematics/angular/service-worker/schema.json
diff --git a/packages/schematics/angular/service/schema.json b/packages/schematics/angular/service/schema.json
diff --git a/packages/schematics/angular/universal/schema.json b/packages/schematics/angular/universal/schema.json
diff --git a/packages/schematics/angular/web-worker/schema.json b/packages/schematics/angular/web-worker/schema.json
diff --git a/packages/schematics/angular/workspace/schema.json b/packages/schematics/angular/workspace/schema.json
diff --git a/tests/angular_devkit/core/json/schema/serializers/1.schema.json b/tests/angular_devkit/core/json/schema/serializers/1.schema.json
diff --git a/tests/angular_devkit/core/json/schema/serializers/schema_benchmark.json b/tests/angular_devkit/core/json/schema/serializers/schema_benchmark.json

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "$schema": "http://json-schema.org/schema",`
	`2`	`+ "$schema": "http://json-schema.org/draft-07/schema",`
`3`	`3`	`"$id": "ng-cli://commands/add.json",`
`4`	`4`	`"description": "Adds support for an external library to your project.",`
`5`	`5`	`"$longDescription": "./add.md",`