From 4a805d594e1c82255427b5e4b96ccc72bfdcdd68 Mon Sep 17 00:00:00 2001
From: Josh Goldberg <me@joshuakgoldberg.com>
Date: Wed, 24 Aug 2022 09:09:48 -0400
Subject: [PATCH] chore(eslint-plugin): use defs, not definitions, in rule
 schemas (#5534)

chore(eslint-plugin): use defs, not definitions, in rule schemas
---
 .../eslint-plugin/src/rules/array-type.ts     |  6 +++---
 .../eslint-plugin/src/rules/ban-ts-comment.ts | 10 +++++-----
 .../eslint-plugin/src/rules/comma-dangle.ts   | 20 +++++++++----------
 .../rules/explicit-member-accessibility.ts    | 14 ++++++-------
 .../rules/padding-line-between-statements.ts  |  8 ++++----
 .../src/rules/parameter-properties.ts         |  4 ++--
 6 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/packages/eslint-plugin/src/rules/array-type.ts b/packages/eslint-plugin/src/rules/array-type.ts
index 2618225b599..09339727abd 100644
--- a/packages/eslint-plugin/src/rules/array-type.ts
+++ b/packages/eslint-plugin/src/rules/array-type.ts
@@ -104,18 +104,18 @@ export default util.createRule<Options, MessageIds>({
     },
     schema: [
       {
-        definitions: {
+        $defs: {
           arrayOption: {
             enum: ['array', 'generic', 'array-simple'],
           },
         },
         properties: {
           default: {
-            $ref: '#/definitions/arrayOption',
+            $ref: '#/$defs/arrayOption',
             description: 'The array type expected for mutable cases...',
           },
           readonly: {
-            $ref: '#/definitions/arrayOption',
+            $ref: '#/$defs/arrayOption',
             description:
               'The array type expected for readonly cases. If omitted, the value for `default` will be used.',
           },
diff --git a/packages/eslint-plugin/src/rules/ban-ts-comment.ts b/packages/eslint-plugin/src/rules/ban-ts-comment.ts
index e8857c21eb4..225285fdc16 100644
--- a/packages/eslint-plugin/src/rules/ban-ts-comment.ts
+++ b/packages/eslint-plugin/src/rules/ban-ts-comment.ts
@@ -40,7 +40,7 @@ export default util.createRule<[Options], MessageIds>({
     },
     schema: [
       {
-        definitions: {
+        $defs: {
           directiveConfigSchema: {
             oneOf: [
               {
@@ -62,11 +62,11 @@ export default util.createRule<[Options], MessageIds>({
         type: 'object',
         properties: {
           'ts-expect-error': {
-            $ref: '#/definitions/directiveConfigSchema',
+            $ref: '#/$defs/directiveConfigSchema',
           },
-          'ts-ignore': { $ref: '#/definitions/directiveConfigSchema' },
-          'ts-nocheck': { $ref: '#/definitions/directiveConfigSchema' },
-          'ts-check': { $ref: '#/definitions/directiveConfigSchema' },
+          'ts-ignore': { $ref: '#/$defs/directiveConfigSchema' },
+          'ts-nocheck': { $ref: '#/$defs/directiveConfigSchema' },
+          'ts-check': { $ref: '#/$defs/directiveConfigSchema' },
           minimumDescriptionLength: {
             type: 'number',
             default: defaultMinimumDescriptionLength,
diff --git a/packages/eslint-plugin/src/rules/comma-dangle.ts b/packages/eslint-plugin/src/rules/comma-dangle.ts
index f3986151489..545775785ed 100644
--- a/packages/eslint-plugin/src/rules/comma-dangle.ts
+++ b/packages/eslint-plugin/src/rules/comma-dangle.ts
@@ -46,7 +46,7 @@ export default util.createRule<Options, MessageIds>({
       extendsBaseRule: true,
     },
     schema: {
-      definitions: {
+      $defs: {
         value: {
           enum: OPTION_VALUE_SCHEME,
         },
@@ -59,19 +59,19 @@ export default util.createRule<Options, MessageIds>({
         {
           oneOf: [
             {
-              $ref: '#/definitions/value',
+              $ref: '#/$defs/value',
             },
             {
               type: 'object',
               properties: {
-                arrays: { $ref: '#/definitions/valueWithIgnore' },
-                objects: { $ref: '#/definitions/valueWithIgnore' },
-                imports: { $ref: '#/definitions/valueWithIgnore' },
-                exports: { $ref: '#/definitions/valueWithIgnore' },
-                functions: { $ref: '#/definitions/valueWithIgnore' },
-                enums: { $ref: '#/definitions/valueWithIgnore' },
-                generics: { $ref: '#/definitions/valueWithIgnore' },
-                tuples: { $ref: '#/definitions/valueWithIgnore' },
+                arrays: { $ref: '#/$defs/valueWithIgnore' },
+                objects: { $ref: '#/$defs/valueWithIgnore' },
+                imports: { $ref: '#/$defs/valueWithIgnore' },
+                exports: { $ref: '#/$defs/valueWithIgnore' },
+                functions: { $ref: '#/$defs/valueWithIgnore' },
+                enums: { $ref: '#/$defs/valueWithIgnore' },
+                generics: { $ref: '#/$defs/valueWithIgnore' },
+                tuples: { $ref: '#/$defs/valueWithIgnore' },
               },
               additionalProperties: false,
             },
diff --git a/packages/eslint-plugin/src/rules/explicit-member-accessibility.ts b/packages/eslint-plugin/src/rules/explicit-member-accessibility.ts
index 40ad832b132..fe0637cb8e5 100644
--- a/packages/eslint-plugin/src/rules/explicit-member-accessibility.ts
+++ b/packages/eslint-plugin/src/rules/explicit-member-accessibility.ts
@@ -63,20 +63,20 @@ export default util.createRule<Options, MessageIds>({
     },
     schema: [
       {
-        definitions: {
+        $defs: {
           accessibilityLevel,
         },
         type: 'object',
         properties: {
-          accessibility: { $ref: '#/definitions/accessibilityLevel' },
+          accessibility: { $ref: '#/$defs/accessibilityLevel' },
           overrides: {
             type: 'object',
             properties: {
-              accessors: { $ref: '#/definitions/accessibilityLevel' },
-              constructors: { $ref: '#/definitions/accessibilityLevel' },
-              methods: { $ref: '#/definitions/accessibilityLevel' },
-              properties: { $ref: '#/definitions/accessibilityLevel' },
-              parameterProperties: { $ref: '#/definitions/accessibilityLevel' },
+              accessors: { $ref: '#/$defs/accessibilityLevel' },
+              constructors: { $ref: '#/$defs/accessibilityLevel' },
+              methods: { $ref: '#/$defs/accessibilityLevel' },
+              properties: { $ref: '#/$defs/accessibilityLevel' },
+              parameterProperties: { $ref: '#/$defs/accessibilityLevel' },
             },
 
             additionalProperties: false,
diff --git a/packages/eslint-plugin/src/rules/padding-line-between-statements.ts b/packages/eslint-plugin/src/rules/padding-line-between-statements.ts
index 938ba9524aa..56785573495 100644
--- a/packages/eslint-plugin/src/rules/padding-line-between-statements.ts
+++ b/packages/eslint-plugin/src/rules/padding-line-between-statements.ts
@@ -594,7 +594,7 @@ export default util.createRule<Options, MessageIds>({
     fixable: 'whitespace',
     hasSuggestions: false,
     schema: {
-      definitions: {
+      $defs: {
         paddingType: {
           enum: Object.keys(PaddingTypes),
         },
@@ -615,9 +615,9 @@ export default util.createRule<Options, MessageIds>({
       items: {
         type: 'object',
         properties: {
-          blankLine: { $ref: '#/definitions/paddingType' },
-          prev: { $ref: '#/definitions/statementType' },
-          next: { $ref: '#/definitions/statementType' },
+          blankLine: { $ref: '#/$defs/paddingType' },
+          prev: { $ref: '#/$defs/statementType' },
+          next: { $ref: '#/$defs/statementType' },
         },
         additionalProperties: false,
         required: ['blankLine', 'prev', 'next'],
diff --git a/packages/eslint-plugin/src/rules/parameter-properties.ts b/packages/eslint-plugin/src/rules/parameter-properties.ts
index a2f6fcb8009..e2119b38ac8 100644
--- a/packages/eslint-plugin/src/rules/parameter-properties.ts
+++ b/packages/eslint-plugin/src/rules/parameter-properties.ts
@@ -38,7 +38,7 @@ export default util.createRule<Options, MessageIds>({
     },
     schema: [
       {
-        definitions: {
+        $defs: {
           modifier: {
             enum: [
               'readonly',
@@ -56,7 +56,7 @@ export default util.createRule<Options, MessageIds>({
           allow: {
             type: 'array',
             items: {
-              $ref: '#/definitions/modifier',
+              $ref: '#/$defs/modifier',
             },
             minItems: 1,
           },