Merge branch 'revert-cd60bc5d' into 'master'

Revert "Merge branch 'renovate/eslint-and-related' into 'master'"

See merge request gitlab-org/gitlab!85223

app/assets/javascripts/alerts_settings/graphql/mutations/create_http_integration.mutation.graphql

@@ -3,6 +3,8 @@
 mutation createHttpIntegration($projectPath: ID!, $name: String!, $active: Boolean!) {
   httpIntegrationCreate(input: { projectPath: $projectPath, name: $name, active: $active }) {
     errors
+    # We have ID in a deeply nested fragment
+    # eslint-disable-next-line @graphql-eslint/require-id-when-available
     integration {
       ...HttpIntegrationItem
     }

app/assets/javascripts/alerts_settings/graphql/mutations/destroy_http_integration.mutation.graphql

@@ -3,6 +3,8 @@
 mutation destroyHttpIntegration($id: ID!) {
   httpIntegrationDestroy(input: { id: $id }) {
     errors
+    # We have ID in a deeply nested fragment
+    # eslint-disable-next-line @graphql-eslint/require-id-when-available
     integration {
       ...HttpIntegrationItem
     }

app/assets/javascripts/alerts_settings/graphql/mutations/reset_http_token.mutation.graphql

@@ -3,6 +3,8 @@
 mutation resetHttpIntegrationToken($id: ID!) {
   httpIntegrationResetToken(input: { id: $id }) {
     errors
+    # We have ID in a deeply nested fragment
+    # eslint-disable-next-line @graphql-eslint/require-id-when-available
     integration {
       ...HttpIntegrationItem
     }

app/assets/javascripts/alerts_settings/graphql/mutations/update_http_integration.mutation.graphql

@@ -3,6 +3,8 @@
 mutation updateHttpIntegration($id: ID!, $name: String!, $active: Boolean!) {
   httpIntegrationUpdate(input: { id: $id, name: $name, active: $active }) {
     errors
+    # We have ID in a deeply nested fragment
+    # eslint-disable-next-line @graphql-eslint/require-id-when-available
     integration {
       ...HttpIntegrationItem
     }

app/assets/javascripts/boards/graphql/board_list_create.mutation.graphql

@@ -2,6 +2,8 @@
 
 mutation createBoardList($boardId: BoardID!, $backlog: Boolean, $labelId: LabelID) {
   boardListCreate(input: { boardId: $boardId, backlog: $backlog, labelId: $labelId }) {
+    # We have ID in a deeply nested fragment
+    # eslint-disable-next-line @graphql-eslint/require-id-when-available
     list {
       ...BoardListFragment
     }

app/assets/javascripts/boards/graphql/board_list_update.mutation.graphql

@@ -2,6 +2,8 @@
 
 mutation UpdateBoardList($listId: ID!, $position: Int, $collapsed: Boolean) {
   updateBoardList(input: { listId: $listId, position: $position, collapsed: $collapsed }) {
+    # We have ID in a deeply nested fragment
+    # eslint-disable-next-line @graphql-eslint/require-id-when-available
     list {
       ...BoardListFragment
     }

app/assets/javascripts/boards/graphql/board_lists.query.graphql

@@ -13,6 +13,8 @@ query BoardLists(
       id
       hideBacklogList
       lists(issueFilters: $filters) {
+        # We have ID in a deeply nested fragment
+        # eslint-disable-next-line @graphql-eslint/require-id-when-available
         nodes {
           ...BoardListFragment
         }
@@ -25,6 +27,8 @@ query BoardLists(
       id
       hideBacklogList
       lists(issueFilters: $filters) {
+        # We have ID in a deeply nested fragment
+        # eslint-disable-next-line @graphql-eslint/require-id-when-available
         nodes {
           ...BoardListFragment
         }

app/assets/javascripts/design_management/graphql/mutations/upload_design.mutation.graphql

@@ -3,6 +3,7 @@
 
 mutation uploadDesign($files: [Upload!]!, $projectPath: ID!, $iid: ID!) {
   designManagementUpload(input: { projectPath: $projectPath, iid: $iid, files: $files }) {
+    # eslint-disable-next-line @graphql-eslint/require-id-when-available
     designs {
       ...DesignItem
       versions {

app/assets/javascripts/design_management/graphql/queries/get_design.query.graphql

@@ -13,6 +13,7 @@ query getDesign(
       id
       designCollection {
         designs(atVersion: $atVersion, filenames: $filenames) {
+          # eslint-disable-next-line @graphql-eslint/require-id-when-available
           nodes {
             ...DesignItem
             issue {

app/assets/javascripts/graphql_shared/fragments/user_availability.fragment.graphql

+# eslint-disable-next-line @graphql-eslint/require-id-when-available
 fragment UserAvailability on User {
   status {
     availability

app/assets/javascripts/incidents/graphql/fragments/incident_fields.fragment.graphql

+# eslint-disable-next-line @graphql-eslint/require-id-when-available
 fragment IncidentFields on Issue {
   severity
   escalationStatus

app/assets/javascripts/runner/graphql/details/runner.query.graphql

 #import "ee_else_ce/runner/graphql/details/runner_details.fragment.graphql"
 
 query getRunner($id: CiRunnerID!) {
+  # We have an id in deeply nested fragment
+  # eslint-disable-next-line @graphql-eslint/require-id-when-available
   runner(id: $id) {
     ...RunnerDetails
   }

app/assets/javascripts/runner/graphql/details/runner_update.mutation.graphql

@@ -5,6 +5,8 @@
 
 mutation runnerUpdate($input: RunnerUpdateInput!) {
   runnerUpdate(input: $input) {
+    # We have an id in deep nested fragment
+    # eslint-disable-next-line @graphql-eslint/require-id-when-available
     runner {
       ...RunnerDetails
     }

ee/app/assets/javascripts/alerts_settings/graphql/mutations/create_http_integration.mutation.graphql

@@ -17,6 +17,8 @@ mutation createHttpIntegrationEE(
     }
   ) {
     errors
+    # We have an id in deeply nested fragment
+    # eslint-disable-next-line @graphql-eslint/require-id-when-available
     integration {
       ...HttpIntegrationItem
     }

ee/app/assets/javascripts/alerts_settings/graphql/mutations/update_http_integration.mutation.graphql

@@ -17,6 +17,8 @@ mutation updateHttpIntegrationEE(
     }
   ) {
     errors
+    # We have an id in deeply nested fragment
+    # eslint-disable-next-line @graphql-eslint/require-id-when-available
     integration {
       ...HttpIntegrationItem
     }

ee/app/assets/javascripts/boards/graphql/board_list_create.mutation.graphql

@@ -18,6 +18,8 @@ mutation createBoardListEE(
       assigneeId: $assigneeId
     }
   ) {
+    # We have an id in deeply nested fragment
+    # eslint-disable-next-line @graphql-eslint/require-id-when-available
     list {
       ...BoardListFragment
     }

ee/app/assets/javascripts/boards/graphql/board_lists.query.graphql

@@ -13,6 +13,8 @@ query ListIssues(
       id
       hideBacklogList
       lists(issueFilters: $filters) {
+        # We have an id in deeply nested fragment
+        # eslint-disable-next-line @graphql-eslint/require-id-when-available
         nodes {
           ...BoardListFragment
         }
@@ -25,6 +27,8 @@ query ListIssues(
       id
       hideBacklogList
       lists(issueFilters: $filters) {
+        # We have an id in deeply nested fragment
+        # eslint-disable-next-line @graphql-eslint/require-id-when-available
         nodes {
           ...BoardListFragment
         }

ee/app/assets/javascripts/boards/graphql/list_update_limit_metrics.mutation.graphql

@@ -2,6 +2,8 @@
 
 mutation boardListUpdateLimitMetrics($input: BoardListUpdateLimitMetricsInput!) {
   boardListUpdateLimitMetrics(input: $input) {
+    # We have an id in deeply nested fragment
+    # eslint-disable-next-line @graphql-eslint/require-id-when-available
     list {
       ...BoardListFragment
     }

ee/app/assets/javascripts/incidents/graphql/fragments/incident_fields.fragment.graphql

+# eslint-disable-next-line @graphql-eslint/require-id-when-available
 fragment IncidentFields on Issue {
   severity
   escalationStatus

ee/app/assets/javascripts/oncall_schedules/graphql/queries/get_oncall_schedules_with_rotations_shifts.query.graphql

@@ -6,6 +6,8 @@ query getShiftsForRotations($projectPath: ID!, $startsAt: Time!, $endsAt: Time!,
     incidentManagementOncallSchedules(iids: $iids) {
       nodes {
         rotations {
+          # We have an id in deeply nested fragment
+          # eslint-disable-next-line @graphql-eslint/require-id-when-available
           nodes {
             ...OnCallRotationWithShifts
           }

ee/app/assets/javascripts/security_dashboard/graphql/fragments/project_vulnerability_severities_count.fragment.graphql

 #import "ee/security_dashboard/graphql/fragments/vulnerability_severities_count.fragment.graphql"
+# eslint-disable-next-line @graphql-eslint/require-id-when-available
 fragment ProjectVulnerabilitySeveritiesCount on Project {
   vulnerabilitySeveritiesCount(state: [DETECTED, CONFIRMED]) {
     ...VulnerabilitySeveritiesCount

package.json

@@ -205,7 +205,7 @@
     "@babel/plugin-transform-modules-commonjs": "^7.10.1",
     "@gitlab/eslint-plugin": "12.0.1",
     "@gitlab/stylelint-config": "4.0.0",
-    "@graphql-eslint/eslint-plugin": "3.10.2",
+    "@graphql-eslint/eslint-plugin": "3.0.0",
     "@testing-library/dom": "^7.16.2",
     "@types/jest": "^26.0.24",
     "@vue/test-utils": "1.3.0",