Bump/linters (#6128)

* bump linters

* lockfiles

* sort imports

* auto fix import sort order

* fix lint errors

* markdown

SECURITY.md

@@ -2,6 +2,6 @@
 
 ## Reporting a Vulnerability
 
-To report a vulnerability in the Kong gateway, Insomnia or other Kong software, or know of a publicly disclosed security vulnerability, please immediately let us know by emailing [email protected].
+To report a vulnerability in the Kong gateway, Insomnia or other Kong software, or know of a publicly disclosed security vulnerability, please immediately let us know by emailing <[email protected]>.
 
 For more detailed information, please see [Kong's Security Update Process](https://docs.konghq.com/gateway-oss/latest/kong-security-update-process/#reporting-a-vulnerability).

package.json

@@ -51,19 +51,19 @@
     "@typescript-eslint/parser": "^5.10.2",
     "esbuild": "^0.16.0",
     "esbuild-runner": "^2.2.1",
-    "eslint": "^8.8.0",
+    "eslint": "^8.44.0",
     "eslint-config-helpers": "^1.2.0",
     "eslint-plugin-filenames": "^1.3.2",
-    "eslint-plugin-html": "^6.2.0",
-    "eslint-plugin-import": "^2.25.4",
+    "eslint-plugin-html": "^7.1.0",
+    "eslint-plugin-import": "^2.27.5",
     "eslint-plugin-jest": "^26.0.0",
     "eslint-plugin-json": "^3.1.0",
-    "eslint-plugin-react": "^7.28.0",
-    "eslint-plugin-react-hooks": "^4.3.0",
-    "eslint-plugin-simple-import-sort": "^7.0.0",
+    "eslint-plugin-react": "^7.32.2",
+    "eslint-plugin-react-hooks": "^4.6.0",
+    "eslint-plugin-simple-import-sort": "^10.0.0",
     "jest": "^28.1.0",
     "lerna": "^6.6.2",
-    "markdownlint-cli2": "^0.2.0",
+    "markdownlint-cli2": "^0.8.1",
     "rimraf": "^3.0.2",
     "svg-text-to-path": "^1.1.2",
     "svgo": "^2.8.0",

packages/insomnia/package.json

@@ -46,13 +46,13 @@
     "@grpc/grpc-js": "^1.8.17",
     "@grpc/proto-loader": "^0.7.7",
     "@jest/globals": "^28.1.0",
+    "@segment/analytics-node": "1.0.0",
     "@sentry/electron": "^3.0.7",
     "@stoplight/spectral-core": "^1.12.2",
     "@stoplight/spectral-formats": "^1.2.0",
     "@stoplight/spectral-ruleset-bundler": "1.5.0",
     "@stoplight/spectral-rulesets": "^1.9.0",
     "ajv": "^8.6.2",
-    "@segment/analytics-node": "1.0.0",
     "apiconnect-wsdl": "^1.8.31",
     "aws4": "^1.11.0",
     "axios": "^1.4.0",

packages/insomnia/src/main/export.ts

@@ -1,7 +1,8 @@
-import electron from 'electron';
 import fs, { mkdir } from 'node:fs/promises';
 import path from 'node:path';
 
+import electron from 'electron';
+
 import { version } from '../../package.json';
 import { database as db } from '../common/database';
 import { exportRequestsData } from '../common/export';

packages/insomnia/src/ui/components/codemirror/lint/javascript-async-lint.ts

@@ -4,7 +4,7 @@
 //
 // The major modifications are marked in comments starting with "CHANGED ---"
 import CodeMirror from 'codemirror';
-import { type LintError, JSHINT, LintOptions } from 'jshint';
+import { JSHINT, type LintError, LintOptions } from 'jshint';
 CodeMirror.registerHelper('lint', 'javascript', validator);
 
 interface ValidationError {

packages/insomnia/src/ui/components/dropdowns/environments-dropdown.tsx

@@ -4,7 +4,7 @@ import { useSelector } from 'react-redux';
 import * as models from '../../../models';
 import type { Environment } from '../../../models/environment';
 import { selectActiveWorkspaceMeta, selectEnvironments, selectHotKeyRegistry } from '../../redux/selectors';
-import { type DropdownHandle, Dropdown, DropdownButton, DropdownItem, DropdownSection, ItemContent } from '../base/dropdown';
+import { Dropdown, DropdownButton, type DropdownHandle, DropdownItem, DropdownSection, ItemContent } from '../base/dropdown';
 import { useDocBodyKeyboardShortcuts } from '../keydown-binder';
 import { showModal } from '../modals/index';
 import { WorkspaceEnvironmentsEditModal } from '../modals/workspace-environments-edit-modal';

packages/insomnia/src/ui/components/dropdowns/git-sync-dropdown.tsx

@@ -15,9 +15,9 @@ import {
   PushToGitRemoteResult,
 } from '../../routes/git-actions';
 import {
-  type DropdownHandle,
   Dropdown,
   DropdownButton,
+  type DropdownHandle,
   DropdownItem,
   DropdownSection,
   ItemContent,

packages/insomnia/src/ui/components/dropdowns/method-dropdown.tsx

@@ -2,7 +2,7 @@ import React, { forwardRef, useCallback, useState } from 'react';
 import styled from 'styled-components';
 
 import { HTTP_METHODS } from '../../../common/constants';
-import { type DropdownHandle, Dropdown, DropdownButton, DropdownItem, DropdownSection, ItemContent } from '../base/dropdown';
+import { Dropdown, DropdownButton, type DropdownHandle, DropdownItem, DropdownSection, ItemContent } from '../base/dropdown';
 import { showPrompt } from '../modals/index';
 
 const LOCALSTORAGE_KEY = 'insomnia.httpMethods';

packages/insomnia/src/ui/components/dropdowns/request-actions-dropdown.tsx

@@ -18,7 +18,7 @@ import { getRequestActions } from '../../../plugins';
 import * as pluginContexts from '../../../plugins/context/index';
 import { updateRequestMetaByParentId } from '../../hooks/create-request';
 import { selectHotKeyRegistry } from '../../redux/selectors';
-import { type DropdownHandle, type DropdownProps, Dropdown, DropdownButton, DropdownItem, DropdownSection, ItemContent } from '../base/dropdown';
+import { Dropdown, DropdownButton, type DropdownHandle, DropdownItem, type DropdownProps, DropdownSection, ItemContent } from '../base/dropdown';
 import { showError, showModal, showPrompt } from '../modals';
 import { AlertModal } from '../modals/alert-modal';
 import { GenerateCodeModal } from '../modals/generate-code-modal';

packages/insomnia/src/ui/components/dropdowns/request-group-actions-dropdown.tsx

@@ -12,7 +12,7 @@ import * as pluginContexts from '../../../plugins/context/index';
 import { createRequest, CreateRequestType } from '../../hooks/create-request';
 import { createRequestGroup } from '../../hooks/create-request-group';
 import { selectActiveEnvironment, selectActiveProject, selectActiveWorkspace, selectHotKeyRegistry } from '../../redux/selectors';
-import { type DropdownHandle, type DropdownProps, Dropdown, DropdownButton, DropdownItem, DropdownSection, ItemContent } from '../base/dropdown';
+import { Dropdown, DropdownButton, type DropdownHandle, DropdownItem, type DropdownProps, DropdownSection, ItemContent } from '../base/dropdown';
 import { showError, showModal, showPrompt } from '../modals';
 import { EnvironmentEditModal } from '../modals/environment-edit-modal';
 

packages/insomnia/src/ui/components/dropdowns/response-history-dropdown.tsx

@@ -10,7 +10,7 @@ import { WebSocketRequest } from '../../../models/websocket-request';
 import { isWebSocketResponse, WebSocketResponse } from '../../../models/websocket-response';
 import { updateRequestMetaByParentId } from '../../hooks/create-request';
 import { selectActiveEnvironment, selectActiveRequest, selectActiveRequestResponses, selectRequestVersions } from '../../redux/selectors';
-import { type DropdownHandle, Dropdown, DropdownButton, DropdownItem, DropdownSection, ItemContent } from '../base/dropdown';
+import { Dropdown, DropdownButton, type DropdownHandle, DropdownItem, DropdownSection, ItemContent } from '../base/dropdown';
 import { useDocBodyKeyboardShortcuts } from '../keydown-binder';
 import { SizeTag } from '../tags/size-tag';
 import { StatusTag } from '../tags/status-tag';

packages/insomnia/src/ui/components/dropdowns/websocket-request-actions-dropdown.tsx

@@ -7,7 +7,7 @@ import { incrementDeletedRequests } from '../../../models/stats';
 import { WebSocketRequest } from '../../../models/websocket-request';
 import { updateRequestMetaByParentId } from '../../hooks/create-request';
 import { selectHotKeyRegistry } from '../../redux/selectors';
-import { type DropdownHandle, type DropdownProps, Dropdown, DropdownButton, DropdownItem, DropdownSection, ItemContent } from '../base/dropdown';
+import { Dropdown, DropdownButton, type DropdownHandle, DropdownItem, type DropdownProps, DropdownSection, ItemContent } from '../base/dropdown';
 import { showPrompt } from '../modals';
 
 interface Props extends Omit<DropdownProps, 'children' > {

packages/insomnia/src/ui/components/dropdowns/workspace-dropdown.tsx

@@ -13,7 +13,7 @@ import { ConfigGenerator, getConfigGenerators, getWorkspaceActions } from '../..
 import * as pluginContexts from '../../../plugins/context';
 import { useAIContext } from '../../context/app/ai-context';
 import { selectActiveApiSpec, selectActiveEnvironment, selectActiveProject, selectActiveWorkspace, selectActiveWorkspaceName, selectSettings } from '../../redux/selectors';
-import { type DropdownHandle, Dropdown, DropdownButton, DropdownItem, DropdownSection, ItemContent } from '../base/dropdown';
+import { Dropdown, DropdownButton, type DropdownHandle, DropdownItem, DropdownSection, ItemContent } from '../base/dropdown';
 import { InsomniaAI } from '../insomnia-ai-icon';
 import { showError, showModal } from '../modals';
 import { showGenerateConfigModal } from '../modals/generate-config-modal';

packages/insomnia/src/ui/components/keydown-binder.ts

@@ -1,6 +1,6 @@
 import { useEffect } from 'react';
 import { useSelector } from 'react-redux';
-import tinykeys, { type KeyBindingMap, createKeybindingsHandler as _createKeybindingsHandler, KeyBindingHandlerOptions } from 'tinykeys';
+import tinykeys, { createKeybindingsHandler as _createKeybindingsHandler, KeyBindingHandlerOptions, type KeyBindingMap } from 'tinykeys';
 
 import { getPlatformKeyCombinations } from '../../common/hotkeys';
 import { keyboardKeys } from '../../common/keyboard-keys';

packages/insomnia/src/ui/components/modals/alert-modal.tsx

@@ -1,6 +1,6 @@
 import React, { forwardRef, ReactNode, useImperativeHandle, useRef, useState } from 'react';
 
-import { type ModalHandle, Modal, ModalProps } from '../base/modal';
+import { Modal, type ModalHandle, ModalProps } from '../base/modal';
 import { ModalBody } from '../base/modal-body';
 import { ModalFooter } from '../base/modal-footer';
 import { ModalHeader } from '../base/modal-header';

packages/insomnia/src/ui/components/modals/ask-modal.tsx

@@ -1,6 +1,6 @@
 import React, { forwardRef, useImperativeHandle, useRef, useState } from 'react';
 
-import { type ModalHandle, Modal, ModalProps } from '../base/modal';
+import { Modal, type ModalHandle, ModalProps } from '../base/modal';
 import { ModalBody } from '../base/modal-body';
 import { ModalFooter } from '../base/modal-footer';
 import { ModalHeader } from '../base/modal-header';

packages/insomnia/src/ui/components/modals/code-prompt-modal.tsx

@@ -3,7 +3,7 @@ import React, { forwardRef, useImperativeHandle, useRef, useState } from 'react'
 import { NunjucksEnabledProvider } from '../../context/nunjucks/nunjucks-enabled-context';
 import { CopyButton } from '../base/copy-button';
 import { Dropdown, DropdownButton, DropdownItem, DropdownSection, ItemContent } from '../base/dropdown';
-import { type ModalHandle, Modal, ModalProps } from '../base/modal';
+import { Modal, type ModalHandle, ModalProps } from '../base/modal';
 import { ModalBody } from '../base/modal-body';
 import { ModalFooter } from '../base/modal-footer';
 import { ModalHeader } from '../base/modal-header';

packages/insomnia/src/ui/components/modals/cookie-modify-modal.tsx

@@ -8,7 +8,7 @@ import { cookieToString } from '../../../common/cookies';
 import * as models from '../../../models';
 import type { Cookie } from '../../../models/cookie-jar';
 import { selectActiveCookieJar } from '../../redux/selectors';
-import { type ModalHandle, Modal, ModalProps } from '../base/modal';
+import { Modal, type ModalHandle, ModalProps } from '../base/modal';
 import { ModalBody } from '../base/modal-body';
 import { ModalFooter } from '../base/modal-footer';
 import { ModalHeader } from '../base/modal-header';

packages/insomnia/src/ui/components/modals/cookies-modal.tsx

@@ -6,7 +6,7 @@ import * as models from '../../../models';
 import type { Cookie } from '../../../models/cookie-jar';
 import { useNunjucks } from '../../context/nunjucks/use-nunjucks';
 import { selectActiveCookieJar } from '../../redux/selectors';
-import { type ModalHandle, Modal, ModalProps } from '../base/modal';
+import { Modal, type ModalHandle, ModalProps } from '../base/modal';
 import { ModalBody } from '../base/modal-body';
 import { ModalFooter } from '../base/modal-footer';
 import { ModalHeader } from '../base/modal-header';

packages/insomnia/src/ui/components/modals/environment-edit-modal.tsx

@@ -2,7 +2,7 @@ import React, { forwardRef, useImperativeHandle, useRef, useState } from 'react'
 
 import * as models from '../../../models/index';
 import { RequestGroup } from '../../../models/request-group';
-import { type ModalHandle, Modal, ModalProps } from '../base/modal';
+import { Modal, type ModalHandle, ModalProps } from '../base/modal';
 import { ModalBody } from '../base/modal-body';
 import { ModalFooter } from '../base/modal-footer';
 import { ModalHeader } from '../base/modal-header';

packages/insomnia/src/ui/components/modals/error-modal.tsx

@@ -1,6 +1,6 @@
 import React, { forwardRef, useImperativeHandle, useRef, useState } from 'react';
 
-import { type ModalHandle, Modal, ModalProps } from '../base/modal';
+import { Modal, type ModalHandle, ModalProps } from '../base/modal';
 import { ModalBody } from '../base/modal-body';
 import { ModalFooter } from '../base/modal-footer';
 import { ModalHeader } from '../base/modal-header';

packages/insomnia/src/ui/components/modals/export-requests-modal.tsx

@@ -8,7 +8,7 @@ import { isRequest, Request } from '../../../models/request';
 import { isRequestGroup, RequestGroup } from '../../../models/request-group';
 import { isWebSocketRequest, WebSocketRequest } from '../../../models/websocket-request';
 import { selectSidebarChildren } from '../../redux/sidebar-selectors';
-import { type ModalHandle, Modal, ModalProps } from '../base/modal';
+import { Modal, type ModalHandle, ModalProps } from '../base/modal';
 import { ModalBody } from '../base/modal-body';
 import { ModalFooter } from '../base/modal-footer';
 import { ModalHeader } from '../base/modal-header';

packages/insomnia/src/ui/components/modals/filter-help-modal.tsx

@@ -1,7 +1,7 @@
 import React, { FC, forwardRef, useImperativeHandle, useRef, useState } from 'react';
 
 import { Link } from '../base/link';
-import { type ModalHandle, Modal, ModalProps } from '../base/modal';
+import { Modal, type ModalHandle, ModalProps } from '../base/modal';
 import { ModalBody } from '../base/modal-body';
 import { ModalHeader } from '../base/modal-header';
 

packages/insomnia/src/ui/components/modals/generate-code-modal.tsx

@@ -6,7 +6,7 @@ import { Request } from '../../../models/request';
 import { CopyButton } from '../base/copy-button';
 import { Dropdown, DropdownButton, DropdownItem, ItemContent } from '../base/dropdown';
 import { Link } from '../base/link';
-import { type ModalHandle, Modal, ModalProps } from '../base/modal';
+import { Modal, type ModalHandle, ModalProps } from '../base/modal';
 import { ModalBody } from '../base/modal-body';
 import { ModalFooter } from '../base/modal-footer';
 import { ModalHeader } from '../base/modal-header';

packages/insomnia/src/ui/components/modals/generate-config-modal.tsx

@@ -6,7 +6,7 @@ import type { ConfigGenerator } from '../../../plugins';
 import * as plugins from '../../../plugins';
 import { CopyButton } from '../base/copy-button';
 import { Link } from '../base/link';
-import { type ModalHandle, Modal, ModalProps } from '../base/modal';
+import { Modal, type ModalHandle, ModalProps } from '../base/modal';
 import { ModalBody } from '../base/modal-body';
 import { ModalFooter } from '../base/modal-footer';
 import { ModalHeader } from '../base/modal-header';

packages/insomnia/src/ui/components/modals/git-branches-modal.tsx

@@ -5,7 +5,7 @@ import { useFetcher, useParams } from 'react-router-dom';
 
 import { GitRepository } from '../../../models/git-repository';
 import { CreateNewGitBranchResult, GitBranchesLoaderData } from '../../routes/git-actions';
-import { type ModalHandle, Modal, ModalProps } from '../base/modal';
+import { Modal, type ModalHandle, ModalProps } from '../base/modal';
 import { ModalBody } from '../base/modal-body';
 import { ModalFooter } from '../base/modal-footer';
 import { ModalHeader } from '../base/modal-header';

packages/insomnia/src/ui/components/modals/git-log-modal.tsx

@@ -3,7 +3,7 @@ import { OverlayContainer } from 'react-aria';
 import { useFetcher, useParams } from 'react-router-dom';
 
 import { GitLogLoaderData } from '../../routes/git-actions';
-import { type ModalHandle, Modal, ModalProps } from '../base/modal';
+import { Modal, type ModalHandle, ModalProps } from '../base/modal';
 import { ModalBody } from '../base/modal-body';
 import { ModalFooter } from '../base/modal-footer';
 import { ModalHeader } from '../base/modal-header';

packages/insomnia/src/ui/components/modals/git-repository-settings-modal/git-repo-clone-modal.tsx

@@ -5,7 +5,7 @@ import styled from 'styled-components';
 import { docsGitSync } from '../../../../common/documentation';
 import type { GitRepository, OauthProviderName } from '../../../../models/git-repository';
 import { Link } from '../../base/link';
-import { type ModalHandle, Modal, ModalProps } from '../../base/modal';
+import { Modal, type ModalHandle, ModalProps } from '../../base/modal';
 import { ModalBody } from '../../base/modal-body';
 import { ModalFooter } from '../../base/modal-footer';
 import { ModalHeader } from '../../base/modal-header';

packages/insomnia/src/ui/components/modals/git-repository-settings-modal/git-repository-settings-modal.tsx

@@ -6,7 +6,7 @@ import styled from 'styled-components';
 import { docsGitSync } from '../../../../common/documentation';
 import type { GitRepository, OauthProviderName } from '../../../../models/git-repository';
 import { Link } from '../../base/link';
-import { type ModalHandle, Modal, ModalProps } from '../../base/modal';
+import { Modal, type ModalHandle, ModalProps } from '../../base/modal';
 import { ModalBody } from '../../base/modal-body';
 import { ModalFooter } from '../../base/modal-footer';
 import { ModalHeader } from '../../base/modal-header';

packages/insomnia/src/ui/components/modals/git-staging-modal.tsx

@@ -7,7 +7,7 @@ import { strings } from '../../../common/strings';
 import * as models from '../../../models';
 import { CommitToGitRepoResult, GitChangesLoaderData, GitRollbackChangesResult } from '../../routes/git-actions';
 import { IndeterminateCheckbox } from '../base/indeterminate-checkbox';
-import { type ModalHandle, Modal, ModalProps } from '../base/modal';
+import { Modal, type ModalHandle, ModalProps } from '../base/modal';
 import { ModalBody } from '../base/modal-body';
 import { ModalFooter } from '../base/modal-footer';
 import { ModalHeader } from '../base/modal-header';

packages/insomnia/src/ui/components/modals/login-modal.tsx

@@ -2,7 +2,7 @@ import React, { FormEvent, forwardRef, useCallback, useEffect, useImperativeHand
 
 import * as session from '../../../account/session';
 import { getLoginUrl, submitAuthCode } from '../../auth-session-provider';
-import { type ModalHandle, Modal } from '../base/modal';
+import { Modal, type ModalHandle } from '../base/modal';
 import { ModalBody } from '../base/modal-body';
 import { ModalFooter } from '../base/modal-footer';
 import { ModalHeader } from '../base/modal-header';

packages/insomnia/src/ui/components/modals/nunjucks-modal.tsx

@@ -1,7 +1,7 @@
 import React, { forwardRef, useImperativeHandle, useRef, useState } from 'react';
 
 import { Workspace } from '../../../models/workspace';
-import { type ModalHandle, Modal, ModalProps } from '../base/modal';
+import { Modal, type ModalHandle, ModalProps } from '../base/modal';
 import { ModalBody } from '../base/modal-body';
 import { ModalFooter } from '../base/modal-footer';
 import { ModalHeader } from '../base/modal-header';

packages/insomnia/src/ui/components/modals/project-settings-modal.tsx

@@ -4,7 +4,7 @@ import { useFetcher, useParams } from 'react-router-dom';
 
 import { strings } from '../../../common/strings';
 import { isRemoteProject, Project } from '../../../models/project';
-import { type ModalHandle, Modal, ModalProps } from '../base/modal';
+import { Modal, type ModalHandle, ModalProps } from '../base/modal';
 import { ModalBody } from '../base/modal-body';
 import { ModalHeader } from '../base/modal-header';
 import { PromptButton } from '../base/prompt-button';

packages/insomnia/src/ui/components/modals/proto-files-modal.tsx

@@ -8,10 +8,10 @@ import { ChangeBufferEvent, database as db } from '../../../common/database';
 import { selectFileOrFolder } from '../../../common/select-file-or-folder';
 import * as models from '../../../models';
 import { isProtoDirectory, ProtoDirectory } from '../../../models/proto-directory';
-import { type ProtoFile, isProtoFile } from '../../../models/proto-file';
+import { isProtoFile, type ProtoFile } from '../../../models/proto-file';
 import { ProtoDirectoryLoader } from '../../../network/grpc/proto-directory-loader';
 import { writeProtoFile } from '../../../network/grpc/write-proto-file';
-import { type ModalHandle, Modal } from '../base/modal';
+import { Modal, type ModalHandle } from '../base/modal';
 import { ModalBody } from '../base/modal-body';
 import { ModalFooter } from '../base/modal-footer';
 import { ModalHeader } from '../base/modal-header';

packages/insomnia/src/ui/components/modals/request-group-settings-modal.tsx

@@ -7,7 +7,7 @@ import type { RequestGroup } from '../../../models/request-group';
 import type { Workspace } from '../../../models/workspace';
 import { invariant } from '../../../utils/invariant';
 import { selectWorkspacesForActiveProject } from '../../redux/selectors';
-import { type ModalHandle, Modal, ModalProps } from '../base/modal';
+import { Modal, type ModalHandle, ModalProps } from '../base/modal';
 import { ModalBody } from '../base/modal-body';
 import { ModalHeader } from '../base/modal-header';
 import { CodeEditorHandle } from '../codemirror/code-editor';

packages/insomnia/src/ui/components/modals/request-render-error-modal.tsx

@@ -8,7 +8,7 @@ import { isRequest } from '../../../models/request';
 import { WebSocketRequest } from '../../../models/websocket-request';
 import { RenderError } from '../../../templating';
 import { Link } from '../base/link';
-import { type ModalHandle, Modal, ModalProps } from '../base/modal';
+import { Modal, type ModalHandle, ModalProps } from '../base/modal';
 import { ModalBody } from '../base/modal-body';
 import { ModalHeader } from '../base/modal-header';
 import { RequestSettingsModal } from '../modals/request-settings-modal';