chore(ui): migrate ESLint to flat eslint.config.ts with typescript-eslint and import-x (#11352)

Co-authored-by: Pablo F.G <pablo.fernandez@prowler.com> Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-07-24 21:11:53 +00:00 · 2026-07-21 10:17:54 +02:00
parent 13a9caa803
commit cb31856025
95 changed files with 755 additions and 455 deletions
@@ -1,5 +1,5 @@
-import { LucideIcon } from "lucide-react";
 import {
+  LucideIcon,
  Activity,
  BarChart3,
  Bot,
@@ -1,6 +1,9 @@
 import { AuthForm } from "@/components/auth/oss";
-import { getAuthUrl, isGithubOAuthEnabled } from "@/lib/helper";
-import { isGoogleOAuthEnabled } from "@/lib/helper";
+import {
+  getAuthUrl,
+  isGithubOAuthEnabled,
+  isGoogleOAuthEnabled,
+} from "@/lib/helper";
 import { SearchParamsProps } from "@/types";

 const SignUp = async ({
@@ -2,6 +2,7 @@ import { render, screen } from "@testing-library/react";
 import { describe, expect, it } from "vitest";

 import { LIGHTHOUSE_OVERVIEW_BANNER_HREF } from "../_lib/lighthouse-banner";
+
 import { LighthouseOverviewBanner } from "./lighthouse-overview-banner";

 describe("LighthouseOverviewBanner", () => {
@@ -5,6 +5,7 @@ import {

 import { pickFilterParams } from "../_lib/filter-params";
 import { SSRComponentProps } from "../_types";
+
 import { AttackSurface } from "./_components/attack-surface";

 export const AttackSurfaceSSR = async ({ searchParams }: SSRComponentProps) => {
@@ -13,6 +13,7 @@ import {
  filterProvidersByScope,
  parseFilterIds,
 } from "../../_lib/provider-scope";
+
 import { RiskPlotClient } from "./risk-plot-client";

 export async function RiskPlotSSR({
@@ -7,6 +7,7 @@ import {
 import { SearchParamsProps } from "@/types";

 import { pickFilterParams } from "../../_lib/filter-params";
+
 import { RiskRadarViewClient } from "./risk-radar-view-client";

 export async function RiskRadarViewSSR({
@@ -5,6 +5,7 @@ import {

 import { pickFilterParams } from "../_lib/filter-params";
 import { SSRComponentProps } from "../_types";
+
 import { ResourcesInventory } from "./_components/resources-inventory";

 export const ResourcesInventorySSR = async ({
@@ -2,6 +2,7 @@ import { getFindingsBySeverity } from "@/actions/overview";

 import { pickFilterParams } from "../_lib/filter-params";
 import { SSRComponentProps } from "../_types";
+
 import { RiskSeverityChart } from "./_components/risk-severity-chart";

 export const RiskSeverityChartSSR = async ({
@@ -15,6 +15,7 @@ import {
 } from "@/types/severities";

 import { DEFAULT_TIME_RANGE } from "../_constants/time-range.constants";
+
 import { type TimeRange, TimeRangeSelector } from "./time-range-selector";

 interface FindingSeverityOverTimeProps {
@@ -3,6 +3,7 @@ import { Card, CardContent, CardHeader, CardTitle } from "@/components/shadcn";

 import { pickFilterParams } from "../_lib/filter-params";
 import { SSRComponentProps } from "../_types";
+
 import { FindingSeverityOverTime } from "./_components/finding-severity-over-time";
 import { FindingSeverityOverTimeSkeleton } from "./_components/finding-severity-over-time.skeleton";
 import { DEFAULT_TIME_RANGE } from "./_constants/time-range.constants";
@@ -2,6 +2,7 @@ import { getThreatScore } from "@/actions/overview";

 import { pickFilterParams } from "../_lib/filter-params";
 import { SSRComponentProps } from "../_types";
+
 import { ThreatScore } from "./_components/threat-score";

 export const ThreatScoreSSR = async ({ searchParams }: SSRComponentProps) => {
@@ -5,6 +5,7 @@ import {

 import { pickFilterParams } from "../_lib/filter-params";
 import { SSRComponentProps } from "../_types";
+
 import { ComplianceWatchlist } from "./_components/compliance-watchlist";

 export const ComplianceWatchlistSSR = async ({
@@ -2,6 +2,7 @@ import { getServicesOverview, ServiceOverview } from "@/actions/overview";

 import { pickFilterParams } from "../_lib/filter-params";
 import { SSRComponentProps } from "../_types";
+
 import { ServiceWatchlist } from "./_components/service-watchlist";

 export const ServiceWatchlistSSR = async ({
@@ -25,6 +25,7 @@ vi.mock("@/lib/server-actions-helper", () => ({
 }));

 import { ALERT_AGGREGATE_OPS, ALERT_TRIGGER_KINDS } from "../_types";
+
 import {
  createAlert,
  deleteAlert,
@@ -15,12 +15,10 @@ import {
  ALERT_TRIGGER_KINDS,
  type AlertRule,
 } from "@/app/(prowler)/alerts/_types";
-import { Button } from "@/components/shadcn";
-import { useToast } from "@/components/shadcn";
+import { Button, useToast } from "@/components/shadcn";
 import { Modal } from "@/components/shadcn/modal";
 import { DOCS_URLS } from "@/lib/external-urls";
-import type { MetaDataProps } from "@/types";
-import type { ScanEntity } from "@/types";
+import type { MetaDataProps, ScanEntity } from "@/types";
 import type { ProviderProps } from "@/types/providers";

 import { toAlertPayload } from "../_lib/alert-adapter";
@@ -29,6 +27,7 @@ import type {
  AlertFormSubmitResult,
  AlertFormValues,
 } from "../_types/alert-form";
+
 import { AlertFormModal } from "./alert-form-modal";
 import { AlertsEmptyState } from "./alerts-empty-state";
 import { AlertsTable } from "./alerts-table";
@@ -28,8 +28,9 @@ import {
  Tooltip,
  TooltipContent,
  TooltipTrigger,
+  ToastAction,
+  useToast,
 } from "@/components/shadcn";
-import { ToastAction, useToast } from "@/components/shadcn";
 import { useCloudUpgradeStore } from "@/store";
 import type { ScanEntity } from "@/types";
 import { CLOUD_UPGRADE_FEATURE } from "@/types/cloud-upgrade";
@@ -2,6 +2,7 @@ import { fireEvent, render, screen } from "@testing-library/react";
 import { describe, expect, it, vi } from "vitest";

 import { ATTACK_PATHS_VIEW_STATES } from "../_lib/get-attack-paths-view-state";
+
 import { AttackPathsStatusPanel } from "./attack-paths-status-panel";

 describe("AttackPathsStatusPanel", () => {
@@ -34,6 +34,7 @@ import {
  resolveHiddenFindingIds,
 } from "../../_lib";
 import { isFindingNode, layoutWithDagre } from "../../_lib/layout";
+
 import { FindingNode } from "./nodes/finding-node";
 import { InternetNode } from "./nodes/internet-node";
 import { ResourceNode } from "./nodes/resource-node";
@@ -12,6 +12,7 @@ import type { GraphNode } from "@/types/attack-paths";
 import { resolveNodeColors, resolveNodeVisual } from "../../../_lib";
 import { FINDING_NODE_DIMENSIONS } from "../../../_lib/node-dimensions";
 import { getNodeLabelDisplay } from "../../../_lib/node-label-lines";
+
 import { HiddenHandles } from "./hidden-handles";

 interface FindingNodeData {
@@ -5,6 +5,7 @@ import { type NodeProps } from "@xyflow/react";
 import type { GraphNode } from "@/types/attack-paths";

 import { resolveNodeColors } from "../../../_lib";
+
 import { HiddenHandles } from "./hidden-handles";

 interface InternetNodeData {
@@ -12,6 +12,7 @@ import type { GraphNode } from "@/types/attack-paths";
 import { resolveNodeColors, resolveNodeVisual } from "../../../_lib";
 import { RESOURCE_NODE_DIMENSIONS } from "../../../_lib/node-dimensions";
 import { getNodeLabelDisplay } from "../../../_lib/node-label-lines";
+
 import { HiddenHandles } from "./hidden-handles";

 interface ResourceNodeData {
@@ -28,13 +28,13 @@ import {
 import { StatusAlert } from "@/components/shared/status-alert";
 import { useMountEffect } from "@/hooks/use-mount-effect";
 import { isCloud } from "@/lib/shared/env";
+import { attackPathsEmptyTour } from "@/lib/tours/attack-paths-empty.tour";
 import {
  attackPathsTour,
  type AttackPathsTourTarget,
  pickDemoQuery,
  pickDemoScan,
 } from "@/lib/tours/attack-paths.tour";
-import { attackPathsEmptyTour } from "@/lib/tours/attack-paths-empty.tour";
 import { advanceActiveTour, useDriverTour } from "@/lib/tours/use-driver-tour";
 import type {
  AttackPathQuery,
@@ -6,6 +6,7 @@ import { useCloudUpgradeStore } from "@/store";
 import { CLOUD_UPGRADE_FEATURE } from "@/types/cloud-upgrade";

 import { COMPLIANCE_TAB } from "../_types";
+
 import { CompliancePageTabs } from "./compliance-page-tabs";
 import { getComplianceTab } from "./compliance-page-tabs.shared";

@@ -29,6 +29,7 @@ import {
  parseCrossProviderFilters,
 } from "../_lib/cross-provider-frameworks";
 import { CROSS_PROVIDER_OVERVIEW_RESULT_STATUS } from "../_types";
+
 import { CrossProviderErrorAlert } from "./cross-provider-error-alert";
 import type {
  CrossProviderAccountOption,
@@ -11,6 +11,7 @@ import {
  CROSS_PROVIDER_OVERVIEW_RESULT_STATUS,
  CROSS_PROVIDER_OVERVIEW_TYPE,
 } from "../_types";
+
 import { CrossProviderOverview } from "./cross-provider-overview";

 vi.mock("../_actions/cross-provider", () => ({
@@ -15,6 +15,7 @@ import {
 } from "../_lib/cross-provider-frameworks";
 import type { CrossProviderFrameworkSummary } from "../_types";
 import { CROSS_PROVIDER_OVERVIEW_RESULT_STATUS } from "../_types";
+
 import { CrossProviderErrorAlert } from "./cross-provider-error-alert";
 import type {
  CrossProviderAccountOption,
@@ -4,6 +4,7 @@ import { describe, expect, it, vi } from "vitest";
 import type { CheckProviderTypesMap, Requirement } from "@/types/compliance";

 import type { CrossProviderRequirementExtras } from "../_types";
+
 import { CrossProviderRequirementContent } from "./cross-provider-requirement-content";

 const { clientAccordionContentMock } = vi.hoisted(() => ({
@@ -2,6 +2,7 @@ import { render, screen } from "@testing-library/react";
 import { describe, expect, it, vi } from "vitest";

 import type { ProviderBreakdownEntry } from "../_types";
+
 import { ProviderCoverageCard } from "./provider-coverage-card";

 vi.mock("@/components/icons/providers-badge/provider-type-icon", () => ({
@@ -1,4 +1,3 @@
-import React from "react";
 import { Suspense } from "react";

 import { getRoles } from "@/actions/roles";
@@ -29,6 +29,7 @@ import {
 import { Skeleton } from "@/components/shadcn/skeleton/skeleton";

 import { ProviderIcon } from "../config/provider-icon";
+
 import { ChatComposerPanel } from "./composer";
 import { ChatEmptyState } from "./empty-state";
 import { useLighthouseChatStore } from "./lighthouse-chat-store-provider";
@@ -42,6 +42,7 @@ import {
  LIGHTHOUSE_CHAT_SURFACE,
  LighthouseV2ChatView,
 } from "../chat/lighthouse-v2-chat-view";
+
 import { LighthousePanelChatSkeleton } from "./lighthouse-panel-chat-skeleton";

 const PANEL_CHAT_STATUS = {
@@ -12,8 +12,7 @@ import {
 } from "@/actions/lighthouse-v1/lighthouse";
 import { DeleteLLMProviderForm } from "@/components/lighthouse-v1/forms/delete-llm-provider-form";
 import { WorkflowConnectLLM } from "@/components/lighthouse-v1/workflow";
-import { Button } from "@/components/shadcn";
-import { NavigationHeader } from "@/components/shadcn";
+import { Button, NavigationHeader } from "@/components/shadcn";
 import { Modal } from "@/components/shadcn/modal";
 import { LIGHTHOUSE_ROUTE } from "@/lib/lighthouse-routes";
 import type { LighthouseProvider } from "@/types/lighthouse-v1";
@@ -15,8 +15,8 @@ import {
  FieldError,
  Skeleton,
  Textarea,
+  useToast,
 } from "@/components/shadcn";
-import { useToast } from "@/components/shadcn";
 import { CustomLink } from "@/components/shadcn/custom/custom-link";
 import { Modal } from "@/components/shadcn/modal";
 import { fontMono } from "@/config/fonts";
@@ -4,8 +4,7 @@ import { useState } from "react";

 import { toggleMuteRule } from "@/actions/mute-rules";
 import { MuteRuleData } from "@/actions/mute-rules/types";
-import { Switch } from "@/components/shadcn";
-import { useToast } from "@/components/shadcn";
+import { Switch, useToast } from "@/components/shadcn";

 interface MuteRuleEnabledToggleProps {
  muteRule: MuteRuleData;
@@ -3,6 +3,7 @@ import { type ReactNode } from "react";
 import { describe, expect, it, vi } from "vitest";

 import { type MuteRuleTableData } from "./mute-rule-target-previews";
+import { MuteRuleTargetsModal } from "./mute-rule-targets-modal";

 vi.mock("@/components/shadcn/modal", () => ({
  Modal: ({
@@ -21,8 +22,6 @@ vi.mock("@/components/shadcn/modal", () => ({
    ) : null,
 }));

-import { MuteRuleTargetsModal } from "./mute-rule-targets-modal";
-
 const longMuteRule: MuteRuleTableData = {
  type: "mute-rules",
  id: "mute-rule-1",
@@ -17,8 +17,8 @@ import {
  FieldLabel,
  Input,
  Textarea,
+  useToast,
 } from "@/components/shadcn";
-import { useToast } from "@/components/shadcn";
 import { CustomLink } from "@/components/shadcn/custom/custom-link";
 import { Modal } from "@/components/shadcn/modal";
 import { DOCS_URLS } from "@/lib/external-urls";
@@ -10,8 +10,7 @@ import {
 import { AccountsSelector } from "@/app/(prowler)/_overview/_components/accounts-selector";
 import { BatchFiltersLayout } from "@/components/filters/batch-filters-layout";
 import { ClearFiltersButton } from "@/components/filters/clear-filters-button";
-import { Button, Card } from "@/components/shadcn";
-import { useToast } from "@/components/shadcn";
+import { Button, Card, useToast } from "@/components/shadcn";
 import { CustomLink } from "@/components/shadcn/custom/custom-link";
 import { Modal } from "@/components/shadcn/modal";
 import { DataTable } from "@/components/shadcn/table";
@@ -11,6 +11,8 @@ import {
 import { getSchedules, getSchedulesPage } from "@/actions/schedules";
 import { auth } from "@/auth.config";
 import { PageReady } from "@/components/onboarding";
+import { ScansPageShell } from "@/components/scans/scans-page-shell";
+import { ScansProvidersEmptyState } from "@/components/scans/scans-providers-empty-state";
 import {
  appendPendingScheduleRowsToPage,
  buildScheduledTabRows,
@@ -20,8 +22,6 @@ import {
  getScanJobsUserFilters,
  pickScheduleProviderFilters,
 } from "@/components/scans/scans.utils";
-import { ScansPageShell } from "@/components/scans/scans-page-shell";
-import { ScansProvidersEmptyState } from "@/components/scans/scans-providers-empty-state";
 import { SkeletonTableScans } from "@/components/scans/table";
 import { ScanJobsTable } from "@/components/scans/table/scan-jobs-table";
 import { ContentLayout } from "@/components/shadcn/content-layout";
@@ -17,8 +17,8 @@ import {
  Tooltip,
  TooltipContent,
  TooltipTrigger,
+  useToast,
 } from "@/components/shadcn";
-import { useToast } from "@/components/shadcn";
 import { CustomInput } from "@/components/shadcn/custom";
 import { Form } from "@/components/shadcn/form";
 import { getSafeCallbackPath } from "@/lib/auth-callback-url";
@@ -15,8 +15,7 @@ import { AuthFooterLink } from "@/components/auth/oss/auth-footer-link";
 import { AuthLayout } from "@/components/auth/oss/auth-layout";
 import { PasswordRequirementsMessage } from "@/components/auth/oss/password-validator";
 import { SocialButtons } from "@/components/auth/oss/social-buttons";
-import { Button, Checkbox } from "@/components/shadcn";
-import { useToast } from "@/components/shadcn";
+import { Button, Checkbox, useToast } from "@/components/shadcn";
 import { CustomInput } from "@/components/shadcn/custom";
 import { CustomLink } from "@/components/shadcn/custom/custom-link";
 import {
@@ -2,8 +2,7 @@

 import { useRef, useState } from "react";

-import { Button } from "@/components/shadcn";
-import { Accordion, AccordionItemProps } from "@/components/shadcn";
+import { Button, Accordion, AccordionItemProps } from "@/components/shadcn";
 import { Card } from "@/components/shadcn/card/card";

 export const ClientAccordionWrapper = ({
@@ -19,6 +19,7 @@ import {
 import { ScanEntity } from "@/types/scans";

 import { getComplianceIcon } from "../icons";
+
 import { ComplianceDownloadContainer } from "./compliance-download-container";

 interface ComplianceCardProps {
@@ -20,8 +20,9 @@ import {
  TableHead,
  TableHeader,
  TableRow,
+  SeverityBadge,
+  StatusFindingBadge,
 } from "@/components/shadcn/table";
-import { SeverityBadge, StatusFindingBadge } from "@/components/shadcn/table";
 import { useFindingGroupResourceState } from "@/hooks/use-finding-group-resource-state";
 import { cn, hasHistoricalFindingFilter } from "@/lib";
 import {
@@ -32,6 +33,7 @@ import {
 import { FindingGroupRow } from "@/types";

 import { FloatingMuteButton } from "../floating-mute-button";
+
 import { getColumnFindingResources } from "./column-finding-resources";
 import { FindingsSelectionContext } from "./findings-selection-context";
 import { ImpactedResourcesCell } from "./impacted-resources-cell";
@@ -14,6 +14,7 @@ import { createExploreFindingsTourStepHandlers } from "@/lib/tours/explore-findi
 import { FindingGroupRow, MetaDataProps } from "@/types";

 import { FloatingMuteButton } from "../floating-mute-button";
+
 import { getColumnFindingGroups } from "./column-finding-groups";
 import { canMuteFindingGroup } from "./finding-group-selection";
 import { FindingsSelectionContext } from "./findings-selection-context";
@@ -71,8 +71,7 @@ import {
  type QueryEditorLanguage,
 } from "@/components/shared/query-code-editor";
 import { ResourceMetadataPanel } from "@/components/shared/resource-metadata-panel";
-import { getFailingForLabel } from "@/lib/date-utils";
-import { formatDuration } from "@/lib/date-utils";
+import { getFailingForLabel, formatDuration } from "@/lib/date-utils";
 import { shouldRefreshAfterTriageUpdate } from "@/lib/finding-triage";
 import { buildFindingAnalysisPrompt } from "@/lib/lighthouse/prompts";
 import { getRegionFlag } from "@/lib/region-flags";
@@ -89,6 +88,7 @@ import {
  FindingTriageStatusCell,
 } from "../finding-triage-cells";
 import { DeltaValues, NotificationIndicator } from "../notification-indicator";
+
 import { ResourceDetailSkeleton } from "./resource-detail-skeleton";
 import type { CheckMeta } from "./use-resource-detail-drawer";

@@ -4,11 +4,9 @@ import { SettingsIcon } from "lucide-react";
 import Link from "next/link";

 import { JiraIcon } from "@/components/icons/services/IconServices";
-import { Button } from "@/components/shadcn";
+import { Button, Card, CardContent, CardHeader } from "@/components/shadcn";
 import { CustomLink } from "@/components/shadcn/custom/custom-link";

-import { Card, CardContent, CardHeader } from "../../shadcn";
-
 export const JiraIntegrationCard = () => {
  return (
    <Card variant="base" padding="lg">
@@ -15,15 +15,19 @@ import {
  IntegrationCardHeader,
  IntegrationSkeleton,
 } from "@/components/integrations/shared";
-import { Button } from "@/components/shadcn";
-import { useToast } from "@/components/shadcn";
+import {
+  Button,
+  useToast,
+  Card,
+  CardContent,
+  CardHeader,
+} from "@/components/shadcn";
 import { Modal } from "@/components/shadcn/modal";
 import { DataTablePagination } from "@/components/shadcn/table/data-table-pagination";
 import { triggerTestConnectionWithDelay } from "@/lib/integrations/test-connection-helper";
 import { MetaDataProps } from "@/types";
 import { IntegrationProps } from "@/types/integrations";

-import { Card, CardContent, CardHeader } from "../../shadcn";
 import { JiraIntegrationForm } from "./jira-integration-form";

 interface JiraIntegrationsManagerProps {
@@ -4,11 +4,9 @@ import { SettingsIcon } from "lucide-react";
 import Link from "next/link";

 import { AmazonS3Icon } from "@/components/icons/services/IconServices";
-import { Button } from "@/components/shadcn";
+import { Button, Card, CardContent, CardHeader } from "@/components/shadcn";
 import { CustomLink } from "@/components/shadcn/custom/custom-link";

-import { Card, CardContent, CardHeader } from "../../shadcn";
-
 export const S3IntegrationCard = () => {
  return (
    <Card variant="base" padding="lg">
@@ -13,8 +13,7 @@ import {
  ProviderTypeIcon,
 } from "@/components/icons/providers-badge/provider-type-icon";
 import { AWSRoleCredentialsForm } from "@/components/providers/workflow/forms/select-credentials-type/aws/credentials-type/aws-role-credentials-form";
-import { Separator } from "@/components/shadcn";
-import { useToast } from "@/components/shadcn";
+import { Separator, useToast } from "@/components/shadcn";
 import { CustomInput } from "@/components/shadcn/custom";
 import { CustomLink } from "@/components/shadcn/custom/custom-link";
 import {
@@ -15,8 +15,13 @@ import {
  IntegrationCardHeader,
  IntegrationSkeleton,
 } from "@/components/integrations/shared";
-import { Button } from "@/components/shadcn";
-import { useToast } from "@/components/shadcn";
+import {
+  Button,
+  useToast,
+  Card,
+  CardContent,
+  CardHeader,
+} from "@/components/shadcn";
 import { Modal } from "@/components/shadcn/modal";
 import { DataTablePagination } from "@/components/shadcn/table/data-table-pagination";
 import { triggerTestConnectionWithDelay } from "@/lib/integrations/test-connection-helper";
@@ -24,7 +29,6 @@ import { MetaDataProps } from "@/types";
 import { IntegrationProps } from "@/types/integrations";
 import { ProviderProps } from "@/types/providers";

-import { Card, CardContent, CardHeader } from "../../shadcn";
 import { S3IntegrationForm } from "./s3-integration-form";

 interface S3IntegrationsManagerProps {
@@ -12,8 +12,13 @@ import { z } from "zod";

 import { createSamlConfig, updateSamlConfig } from "@/actions/integrations";
 import { AddIcon } from "@/components/icons";
-import { Button, Card, CardContent, CardHeader } from "@/components/shadcn";
-import { useToast } from "@/components/shadcn";
+import {
+  Button,
+  Card,
+  CardContent,
+  CardHeader,
+  useToast,
+} from "@/components/shadcn";
 import { CodeSnippet } from "@/components/shadcn/code-snippet/code-snippet";
 import { CustomServerInput } from "@/components/shadcn/custom";
 import { CustomLink } from "@/components/shadcn/custom/custom-link";
@@ -4,11 +4,9 @@ import { SettingsIcon } from "lucide-react";
 import Link from "next/link";

 import { AWSSecurityHubIcon } from "@/components/icons/services/IconServices";
-import { Button } from "@/components/shadcn";
+import { Button, Card, CardContent, CardHeader } from "@/components/shadcn";
 import { CustomLink } from "@/components/shadcn/custom/custom-link";

-import { Card, CardContent, CardHeader } from "../../shadcn";
-
 export const SecurityHubIntegrationCard = () => {
  return (
    <Card variant="base" padding="lg">
@@ -12,8 +12,7 @@ import {
  ProviderTypeIcon,
 } from "@/components/icons/providers-badge/provider-type-icon";
 import { AWSRoleCredentialsForm } from "@/components/providers/workflow/forms/select-credentials-type/aws/credentials-type/aws-role-credentials-form";
-import { Checkbox, Separator } from "@/components/shadcn";
-import { useToast } from "@/components/shadcn";
+import { Checkbox, Separator, useToast } from "@/components/shadcn";
 import { CustomLink } from "@/components/shadcn/custom/custom-link";
 import {
  Form,
@@ -15,8 +15,14 @@ import {
  IntegrationCardHeader,
  IntegrationSkeleton,
 } from "@/components/integrations/shared";
-import { Badge, Button } from "@/components/shadcn";
-import { useToast } from "@/components/shadcn";
+import {
+  Badge,
+  Button,
+  useToast,
+  Card,
+  CardContent,
+  CardHeader,
+} from "@/components/shadcn";
 import { Modal } from "@/components/shadcn/modal";
 import { DataTablePagination } from "@/components/shadcn/table/data-table-pagination";
 import { triggerTestConnectionWithDelay } from "@/lib/integrations/test-connection-helper";
@@ -24,7 +30,6 @@ import { MetaDataProps } from "@/types";
 import { IntegrationProps } from "@/types/integrations";
 import { ProviderProps } from "@/types/providers";

-import { Card, CardContent, CardHeader } from "../../shadcn";
 import { SecurityHubIntegrationForm } from "./security-hub-integration-form";

 interface SecurityHubIntegrationsManagerProps {
@@ -3,11 +3,9 @@
 import { ExternalLinkIcon, LucideIcon } from "lucide-react";
 import Link from "next/link";

-import { Button } from "@/components/shadcn";
+import { Button, Card, CardContent, CardHeader } from "@/components/shadcn";
 import { CustomLink } from "@/components/shadcn/custom/custom-link";

-import { Card, CardContent, CardHeader } from "../../shadcn";
-
 interface LinkCardProps {
  icon: LucideIcon;
  title: string;
@@ -7,8 +7,7 @@ import * as z from "zod";

 import { revokeInvite } from "@/actions/invitations/invitation";
 import { DeleteIcon } from "@/components/icons";
-import { Button } from "@/components/shadcn";
-import { useToast } from "@/components/shadcn";
+import { Button, useToast } from "@/components/shadcn";
 import { Form } from "@/components/shadcn/form";

 const formSchema = z.object({
@@ -5,7 +5,7 @@ import { Controller, useForm } from "react-hook-form";
 import * as z from "zod";

 import { updateInvite } from "@/actions/invitations/invitation";
-import { useToast } from "@/components/shadcn";
+import { useToast, Card, CardContent } from "@/components/shadcn";
 import { CustomInput } from "@/components/shadcn/custom";
 import { Form, FormButtons } from "@/components/shadcn/form";
 import {
@@ -17,8 +17,6 @@ import {
 } from "@/components/shadcn/select/select";
 import { editInviteFormSchema } from "@/types";

-import { Card, CardContent } from "../../shadcn";
-
 export const EditForm = ({
  invitationId,
  invitationEmail,
@@ -7,8 +7,7 @@ import { Controller, useForm } from "react-hook-form";
 import * as z from "zod";

 import { sendInvite } from "@/actions/invitations/invitation";
-import { Button } from "@/components/shadcn";
-import { useToast } from "@/components/shadcn";
+import { Button, useToast } from "@/components/shadcn";
 import { CustomInput } from "@/components/shadcn/custom";
 import { Form } from "@/components/shadcn/form";
 import {
@@ -2,19 +2,18 @@

 import { useControlledState } from "@react-stately/utils";
 import { domAnimation, LazyMotion, m } from "framer-motion";
-import type { ComponentProps } from "react";
-import React from "react";
+import { forwardRef, useMemo } from "react";
+import type { ComponentProps, HTMLAttributes, ReactNode } from "react";

 import { cn } from "@/lib/utils";

 export type VerticalStepProps = {
  className?: string;
-  description?: React.ReactNode;
-  title?: React.ReactNode;
+  description?: ReactNode;
+  title?: ReactNode;
 };

-export interface VerticalStepsProps
-  extends React.HTMLAttributes<HTMLButtonElement> {
+export interface VerticalStepsProps extends HTMLAttributes<HTMLButtonElement> {
  /**
   * An array of steps.
   *
@@ -89,10 +88,7 @@ function CheckIcon(props: ComponentProps<"svg">) {
  );
 }

-export const VerticalSteps = React.forwardRef<
-  HTMLButtonElement,
-  VerticalStepsProps
->(
+export const VerticalSteps = forwardRef<HTMLButtonElement, VerticalStepsProps>(
  (
    {
      color = "primary",
@@ -113,7 +109,7 @@ export const VerticalSteps = React.forwardRef<
      onStepChange,
    );

-    const colors = React.useMemo(() => {
+    const colors = useMemo(() => {
      let userColor;
      let fgColor;

@@ -34,8 +34,8 @@ import {
  CardHeader,
  CardTitle,
  Combobox,
+  useToast,
 } from "@/components/shadcn";
-import { useToast } from "@/components/shadcn";
 import { CustomLink } from "@/components/shadcn/custom/custom-link";
 import { useMountEffect } from "@/hooks/use-mount-effect";
 import type { LighthouseProvider } from "@/types/lighthouse-v1";
@@ -17,8 +17,8 @@ import {
  CardContent,
  CardHeader,
  CardTitle,
+  useToast,
 } from "@/components/shadcn";
-import { useToast } from "@/components/shadcn";
 import { CustomTextarea } from "@/components/shadcn/custom";
 import { Form } from "@/components/shadcn/form";

@@ -5,8 +5,7 @@ import { Controller, useForm } from "react-hook-form";
 import * as z from "zod";

 import { createProviderGroup } from "@/actions/manage-groups";
-import { Button, Separator } from "@/components/shadcn";
-import { useToast } from "@/components/shadcn";
+import { Button, Separator, useToast } from "@/components/shadcn";
 import { CustomInput } from "@/components/shadcn/custom";
 import { Form } from "@/components/shadcn/form";
 import { EnhancedMultiSelect } from "@/components/shadcn/select/enhanced-multi-select";
@@ -8,8 +8,7 @@ import * as z from "zod";

 import { deleteProviderGroup } from "@/actions/manage-groups/manage-groups";
 import { DeleteIcon } from "@/components/icons";
-import { Button } from "@/components/shadcn";
-import { useToast } from "@/components/shadcn";
+import { Button, useToast } from "@/components/shadcn";
 import { Form } from "@/components/shadcn/form";

 const formSchema = z.object({
@@ -7,8 +7,7 @@ import { Controller, useForm } from "react-hook-form";
 import * as z from "zod";

 import { updateProviderGroup } from "@/actions/manage-groups/manage-groups";
-import { Button, Separator } from "@/components/shadcn";
-import { useToast } from "@/components/shadcn";
+import { Button, Separator, useToast } from "@/components/shadcn";
 import { CustomInput } from "@/components/shadcn/custom";
 import { Form } from "@/components/shadcn/form";
 import { EnhancedMultiSelect } from "@/components/shadcn/select/enhanced-multi-select";
@@ -7,8 +7,7 @@ import * as z from "zod";

 import { deleteProvider } from "@/actions/providers";
 import { DeleteIcon } from "@/components/icons";
-import { Button } from "@/components/shadcn";
-import { useToast } from "@/components/shadcn";
+import { Button, useToast } from "@/components/shadcn";
 import { Form } from "@/components/shadcn/form";
 import { ProviderCredentialFields } from "@/lib/provider-credentials/provider-credential-fields";

@@ -7,8 +7,7 @@ import {
  deleteOrganizationalUnit,
 } from "@/actions/organizations/organizations";
 import { DeleteIcon } from "@/components/icons";
-import { Button } from "@/components/shadcn";
-import { useToast } from "@/components/shadcn";
+import { Button, useToast } from "@/components/shadcn";
 import {
  PROVIDERS_GROUP_KIND,
  ProvidersGroupKind,
@@ -4,8 +4,7 @@ import type { Dispatch, FormEvent, SetStateAction } from "react";
 import { useState } from "react";

 import { SaveIcon } from "@/components/icons";
-import { Button } from "@/components/shadcn";
-import { useToast } from "@/components/shadcn";
+import { Button, useToast } from "@/components/shadcn";
 import { Input } from "@/components/shadcn/input/input";

 interface EditNameFormProps {
@@ -26,6 +26,7 @@ import {
  pollConnectionTask,
  runWithConcurrencyLimit,
 } from "../org-account-selection.utils";
+
 import { extractErrorMessage } from "./error-utils";

 interface SelectionState {
@@ -3,8 +3,7 @@
 import { useState } from "react";

 import { setScanConfigurationProviders } from "@/actions/scan-configurations";
-import { Button } from "@/components/shadcn";
-import { useToast } from "@/components/shadcn";
+import { Button, useToast } from "@/components/shadcn";
 import { CustomLink } from "@/components/shadcn/custom/custom-link";
 import { Modal } from "@/components/shadcn/modal";
 import {
@@ -31,6 +31,7 @@ import type {
 } from "@/types/schedules";

 import { LinkToScans } from "../link-to-scans";
+
 import { DataTableRowActions } from "./data-table-row-actions";

 interface GroupNameChipsProps {
@@ -10,6 +10,7 @@ import {
 } from "@/types/provider-wizard";

 import type { ProviderWizardInitialData } from "../types";
+
 import { useProviderWizardController } from "./use-provider-wizard-controller";

 const { refreshMock, requestOpenOnWizardCloseMock } = vi.hoisted(() => ({
@@ -22,6 +22,7 @@ import {
 import { SelectViaGitHub } from "../../workflow/forms/select-credentials-type/github";
 import { SelectViaM365 } from "../../workflow/forms/select-credentials-type/m365";
 import { UpdateViaServiceAccountForm } from "../../workflow/forms/update-via-service-account-key-form";
+
 import {
  WIZARD_FOOTER_ACTION_TYPE,
  WizardFooterConfig,
@@ -11,8 +11,7 @@ import {
  saveScheduleWithInitialScan,
 } from "@/components/scans/schedule/save-schedule";
 import { ScanScheduleFields } from "@/components/scans/schedule/scan-schedule-fields";
-import { Field, FieldLabel } from "@/components/shadcn";
-import { ToastAction, useToast } from "@/components/shadcn";
+import { Field, FieldLabel, ToastAction, useToast } from "@/components/shadcn";
 import { Badge } from "@/components/shadcn/badge/badge";
 import { EntityInfo } from "@/components/shadcn/entities";
 import {
@@ -11,6 +11,7 @@ import {
  TestConnectionForm,
  TestConnectionProviderData,
 } from "../../workflow/forms/test-connection-form";
+
 import {
  WIZARD_FOOTER_ACTION_TYPE,
  WizardFooterConfig,
@@ -37,6 +37,7 @@ import {
 } from "@/types";

 import { ProviderTitleDocs } from "../provider-title-docs";
+
 import {
  AlibabaCloudRoleCredentialsForm,
  AlibabaCloudStaticCredentialsForm,
@@ -11,8 +11,7 @@ import { addProvider } from "@/actions/providers/providers";
 import { AwsMethodSelector } from "@/components/providers/organizations/aws-method-selector";
 import { WizardInputField } from "@/components/providers/workflow/forms/fields";
 import { ProviderTitleDocs } from "@/components/providers/workflow/provider-title-docs";
-import { Button } from "@/components/shadcn";
-import { useToast } from "@/components/shadcn";
+import { Button, useToast } from "@/components/shadcn";
 import { Form } from "@/components/shadcn/form";
 import {
  addProviderFormSchema,
@@ -14,8 +14,7 @@ import { CheckIcon } from "@/components/icons";
 import { Button } from "@/components/shadcn";
 import { Form } from "@/components/shadcn/form";
 import { testProviderConnection } from "@/lib/provider-helpers";
-import { ProviderType } from "@/types";
-import { testConnectionFormSchema } from "@/types";
+import { ProviderType, testConnectionFormSchema } from "@/types";

 import { ProviderConnectionInfo } from "./provider-connection-info";

@@ -1,7 +1,6 @@
 "use client";

-import { Control } from "react-hook-form";
-import { useWatch } from "react-hook-form";
+import { Control, useWatch } from "react-hook-form";

 import { WizardTextareaField } from "@/components/providers/workflow/forms/fields";
 import { KubernetesCredentials } from "@/types";
@@ -1,7 +1,9 @@
 "use client";

-import { getProviderName } from "@/components/shadcn/entities/get-provider-logo";
-import { getProviderLogo } from "@/components/shadcn/entities/get-provider-logo";
+import {
+  getProviderName,
+  getProviderLogo,
+} from "@/components/shadcn/entities/get-provider-logo";
 import { ProviderType } from "@/types";

 export const ProviderTitleDocs = ({
@@ -18,8 +18,6 @@ import {
  Tooltip,
  TooltipContent,
  TooltipTrigger,
-} from "@/components/shadcn";
-import {
  BreadcrumbNavigation,
  CustomBreadcrumbItem,
 } from "@/components/shadcn";
@@ -7,8 +7,7 @@ import * as z from "zod";

 import { deleteRole } from "@/actions/roles";
 import { DeleteIcon } from "@/components/icons";
-import { Button } from "@/components/shadcn";
-import { useToast } from "@/components/shadcn";
+import { Button, useToast } from "@/components/shadcn";
 import { Form } from "@/components/shadcn/form";

 const formSchema = z.object({
@@ -2,19 +2,18 @@

 import { useControlledState } from "@react-stately/utils";
 import { domAnimation, LazyMotion, m } from "framer-motion";
-import type { ComponentProps } from "react";
-import React from "react";
+import { forwardRef, useMemo } from "react";
+import type { ComponentProps, HTMLAttributes, ReactNode } from "react";

 import { cn } from "@/lib/utils";

 export type VerticalStepProps = {
  className?: string;
-  description?: React.ReactNode;
-  title?: React.ReactNode;
+  description?: ReactNode;
+  title?: ReactNode;
 };

-export interface VerticalStepsProps
-  extends React.HTMLAttributes<HTMLButtonElement> {
+export interface VerticalStepsProps extends HTMLAttributes<HTMLButtonElement> {
  /**
   * An array of steps.
   *
@@ -89,10 +88,7 @@ function CheckIcon(props: ComponentProps<"svg">) {
  );
 }

-export const VerticalSteps = React.forwardRef<
-  HTMLButtonElement,
-  VerticalStepsProps
->(
+export const VerticalSteps = forwardRef<HTMLButtonElement, VerticalStepsProps>(
  (
    {
      color = "primary",
@@ -113,7 +109,7 @@ export const VerticalSteps = React.forwardRef<
      onStepChange,
    );

-    const colors = React.useMemo(() => {
+    const colors = useMemo(() => {
      let userColor;
      let fgColor;

@@ -3,7 +3,11 @@ import { render, screen } from "@testing-library/react";
 import type { ReactNode } from "react";
 import { describe, expect, it, vi } from "vitest";

-import type { ScanProps } from "@/types";
+import { type ScanProps, SCAN_JOBS_TAB, type ScanJobsTab } from "@/types";
+import {
+  SCAN_SCHEDULE_CAPABILITY,
+  type ScanScheduleCapability,
+} from "@/types/schedules";

 vi.mock("@/components/shadcn", async (importOriginal) => ({
  ...(await importOriginal<Record<string, unknown>>()),
@@ -65,12 +69,6 @@ vi.mock("./scan-jobs-row-actions", () => ({
  ),
 }));

-import { SCAN_JOBS_TAB, type ScanJobsTab } from "@/types";
-import {
-  SCAN_SCHEDULE_CAPABILITY,
-  type ScanScheduleCapability,
-} from "@/types/schedules";
-
 import { getScanJobsColumns } from "./scan-jobs-columns";

 const getColumnIds = (tab: ScanJobsTab) =>
@@ -10,6 +10,7 @@ import { SCAN_JOBS_TAB, type ScanJobsTab, type ScanProps } from "@/types";
 import type { ScanScheduleCapability } from "@/types/schedules";

 import { formatScanDuration } from "../scans.utils";
+
 import {
  AccountCell,
  ProgressCell,
@@ -7,6 +7,7 @@ import type { ScanScheduleCapability } from "@/types/schedules";

 import { AutoRefresh } from "../auto-refresh";
 import { NoScansEmptyState } from "../no-scans-empty-state";
+
 import { getScanJobsColumns } from "./scan-jobs-columns";

 interface ScanJobsTableProps {
@@ -7,8 +7,7 @@ import * as z from "zod";

 import { deleteUser } from "@/actions/users/users";
 import { DeleteIcon } from "@/components/icons";
-import { Button } from "@/components/shadcn";
-import { useToast } from "@/components/shadcn";
+import { Button, useToast } from "@/components/shadcn";
 import { Form } from "@/components/shadcn/form";

 const formSchema = z.object({
@@ -7,8 +7,7 @@ import { Controller, useForm } from "react-hook-form";
 import * as z from "zod";

 import { updateUser, updateUserRole } from "@/actions/users/users";
-import { Card } from "@/components/shadcn";
-import { useToast } from "@/components/shadcn";
+import { Card, useToast } from "@/components/shadcn";
 import { CustomInput } from "@/components/shadcn/custom";
 import { Form, FormButtons } from "@/components/shadcn/form";
 import {
@@ -4,8 +4,7 @@ import { Dispatch, SetStateAction, useTransition } from "react";

 import { removeUserFromTenant } from "@/actions/users/users";
 import { DeleteIcon } from "@/components/icons";
-import { Button } from "@/components/shadcn";
-import { useToast } from "@/components/shadcn";
+import { Button, useToast } from "@/components/shadcn";

 interface ExpelUserFormProps {
  userId: string;
@@ -759,22 +759,6 @@
    "strategy": "installed",
    "generatedAt": "2025-10-30T10:22:21.335Z"
  },
-  {
-    "section": "devDependencies",
-    "name": "@typescript-eslint/eslint-plugin",
-    "from": "7.18.0",
-    "to": "8.53.0",
-    "strategy": "installed",
-    "generatedAt": "2026-01-19T13:54:24.770Z"
-  },
-  {
-    "section": "devDependencies",
-    "name": "@typescript-eslint/parser",
-    "from": "7.18.0",
-    "to": "8.53.0",
-    "strategy": "installed",
-    "generatedAt": "2026-01-19T13:54:24.770Z"
-  },
  {
    "section": "devDependencies",
    "name": "@vitejs/plugin-react",
@@ -849,17 +833,25 @@
  },
  {
    "section": "devDependencies",
-    "name": "eslint-plugin-jsx-a11y",
-    "from": "6.10.2",
-    "to": "6.10.2",
+    "name": "eslint-import-resolver-typescript",
+    "from": "4.4.4",
+    "to": "4.4.4",
    "strategy": "installed",
-    "generatedAt": "2025-10-22T12:36:37.962Z"
+    "generatedAt": "2026-05-13T15:04:07.559Z"
  },
  {
    "section": "devDependencies",
-    "name": "eslint-plugin-prettier",
-    "from": "5.5.1",
-    "to": "5.5.1",
+    "name": "eslint-plugin-import-x",
+    "from": "4.16.2",
+    "to": "4.16.2",
+    "strategy": "installed",
+    "generatedAt": "2026-05-13T15:02:04.867Z"
+  },
+  {
+    "section": "devDependencies",
+    "name": "eslint-plugin-jsx-a11y",
+    "from": "6.10.2",
+    "to": "6.10.2",
    "strategy": "installed",
    "generatedAt": "2025-10-22T12:36:37.962Z"
  },
@@ -887,22 +879,6 @@
    "strategy": "installed",
    "generatedAt": "2025-10-22T12:36:37.962Z"
  },
-  {
-    "section": "devDependencies",
-    "name": "eslint-plugin-simple-import-sort",
-    "from": "12.1.1",
-    "to": "12.1.1",
-    "strategy": "installed",
-    "generatedAt": "2025-10-22T12:36:37.962Z"
-  },
-  {
-    "section": "devDependencies",
-    "name": "eslint-plugin-unused-imports",
-    "from": "3.2.0",
-    "to": "4.3.0",
-    "strategy": "installed",
-    "generatedAt": "2026-01-19T13:54:24.770Z"
-  },
  {
    "section": "devDependencies",
    "name": "globals",
@@ -911,6 +887,14 @@
    "strategy": "installed",
    "generatedAt": "2026-01-19T13:54:24.770Z"
  },
+  {
+    "section": "devDependencies",
+    "name": "jiti",
+    "from": "2.7.0",
+    "to": "2.7.0",
+    "strategy": "installed",
+    "generatedAt": "2026-05-13T15:02:04.867Z"
+  },
  {
    "section": "devDependencies",
    "name": "jsdom",
@@ -983,6 +967,14 @@
    "strategy": "installed",
    "generatedAt": "2025-10-22T12:36:37.962Z"
  },
+  {
+    "section": "devDependencies",
+    "name": "typescript-eslint",
+    "from": "8.59.3",
+    "to": "8.59.3",
+    "strategy": "installed",
+    "generatedAt": "2026-05-13T15:02:04.867Z"
+  },
  {
    "section": "devDependencies",
    "name": "vitest",
@@ -1,22 +1,15 @@
-import { dirname } from "path";
-import { fileURLToPath } from "url";
-import tsPlugin from "@typescript-eslint/eslint-plugin";
-import tsParser from "@typescript-eslint/parser";
-import prettierPlugin from "eslint-plugin-prettier";
-import simpleImportSort from "eslint-plugin-simple-import-sort";
-import jsxA11y from "eslint-plugin-jsx-a11y";
-import security from "eslint-plugin-security";
-import unusedImports from "eslint-plugin-unused-imports";
 import nextPlugin from "@next/eslint-plugin-next";
+import prettierConfig from "eslint-config-prettier/flat";
+import { createTypeScriptImportResolver } from "eslint-import-resolver-typescript";
+import importX, { createNodeResolver } from "eslint-plugin-import-x";
+import jsxA11y from "eslint-plugin-jsx-a11y";
 import reactPlugin from "eslint-plugin-react";
 import reactHooksPlugin from "eslint-plugin-react-hooks";
+import security from "eslint-plugin-security";
 import globals from "globals";
+import tseslint from "typescript-eslint";

-const __filename = fileURLToPath(import.meta.url);
-const __dirname = dirname(__filename);
-
-export default [
-  // Global ignores (replaces .eslintignore)
+export default tseslint.config(
  {
    ignores: [
      ".now/**",
@@ -29,6 +22,11 @@ export default [
      "scripts/**",
      "*.config.js",
      "*.config.mjs",
+      "auth.config.ts",
+      "eslint.config.ts",
+      "knip.config.ts",
+      "playwright.config.ts",
+      "vitest.config.ts",
      ".DS_Store",
      "node_modules/**",
      "coverage/**",
@@ -37,27 +35,33 @@ export default [
      "next-env.d.ts",
    ],
  },
-
-  // TypeScript and React files configuration
+  importX.flatConfigs.recommended,
+  importX.flatConfigs.typescript,
  {
    files: ["**/*.{ts,tsx,js,jsx}"],
    linterOptions: {
      reportUnusedDisableDirectives: "error",
    },
    plugins: {
-      "@typescript-eslint": tsPlugin,
+      "@typescript-eslint": tseslint.plugin,
      "@next/next": nextPlugin,
      react: reactPlugin,
      "react-hooks": reactHooksPlugin,
-      prettier: prettierPlugin,
-      "simple-import-sort": simpleImportSort,
      "jsx-a11y": jsxA11y,
-      security: security,
-      "unused-imports": unusedImports,
+      security,
    },
    languageOptions: {
-      parser: tsParser,
+      parser: tseslint.parser,
      parserOptions: {
+        projectService: {
+          allowDefaultProject: [
+            // Duplicate of events-timeline.test.ts in the same folder;
+            // TypeScript only picks the .ts sibling, so this .tsx file is
+            // outside the project graph. Tracked for follow-up cleanup.
+            "components/shared/events-timeline/events-timeline.test.tsx",
+          ],
+        },
+        tsconfigRootDir: import.meta.dirname,
        ecmaVersion: "latest",
        sourceType: "module",
        ecmaFeatures: {
@@ -75,46 +79,54 @@ export default [
      react: {
        version: "detect",
      },
+      "import-x/resolver-next": [
+        createTypeScriptImportResolver({
+          alwaysTryTypes: true,
+          project: "./tsconfig.json",
+        }),
+        createNodeResolver(),
+      ],
    },
    rules: {
-      // Console rules - allow console.error but no console.log
      "no-console": ["error", { allow: ["error"] }],
-      eqeqeq: 2,
-      quotes: ["error", "double", "avoid-escape"],
+      eqeqeq: "error",
+      quotes: ["error", "double", { avoidEscape: true }],

-      // TypeScript rules
      "@typescript-eslint/no-explicit-any": "off",
      "@typescript-eslint/no-unused-vars": [
        "error",
        {
+          enableAutofixRemoval: { imports: true },
          argsIgnorePattern: "^_",
          varsIgnorePattern: "^_",
          caughtErrorsIgnorePattern: "^_",
        },
      ],

-      // Security
      "security/detect-object-injection": "off",

-      // Prettier integration
-      "prettier/prettier": [
-        "error",
-        {
-          endOfLine: "auto",
-          tabWidth: 2,
-          useTabs: false,
-        },
-      ],
      "eol-last": ["error", "always"],

-      // Import sorting
-      "simple-import-sort/imports": "error",
-      "simple-import-sort/exports": "error",
+      "import-x/order": [
+        "error",
+        {
+          groups: [
+            "builtin",
+            "external",
+            "internal",
+            "parent",
+            "sibling",
+            "index",
+          ],
+          "newlines-between": "always",
+          alphabetize: { order: "asc", caseInsensitive: true },
+        },
+      ],
+      // Pre-existing duplicate exports and re-export shape mismatches are
+      // tracked separately; the migration keeps behavior parity with the
+      // legacy config until the rule is enforced in the canonical Base layer.
+      "import-x/export": "off",

-      // Unused imports
-      "unused-imports/no-unused-imports": "error",
-
-      // Accessibility
      "jsx-a11y/anchor-is-valid": [
        "error",
        {
@@ -125,14 +137,13 @@ export default [
      ],
      "jsx-a11y/alt-text": "error",

-      // React Hooks
      "react-hooks/rules-of-hooks": "error",
      "react-hooks/exhaustive-deps": "warn",

-      // Next.js specific rules
      "@next/next/no-html-link-for-pages": "error",
      "@next/next/no-img-element": "warn",
      "@next/next/no-sync-scripts": "error",
    },
  },
-];
+  prettierConfig,
+);
@@ -1,6 +1,7 @@
 import { afterEach, beforeEach, describe, expect, it } from "vitest";

 import { TOUR_COMPLETION_STATES } from "../tour-types";
+
 import { buildStorageKey, localStorageAdapter } from "./local-storage-adapter";

 const TOUR_ID = { id: "attack-paths", version: 1 };
@@ -1,4 +1,5 @@
 import type { TourCompletionRecord, TourId } from "../tour-types";
+
 import type { TourCompletionStore } from "./tour-completion-store";

 // All records share ONE localStorage key, keyed by `<id>.v<version>`.
@@ -132,8 +132,6 @@
    "@types/react-dom": "19.2.3",
    "@types/topojson-client": "3.1.5",
    "@types/topojson-specification": "1.0.5",
-    "@typescript-eslint/eslint-plugin": "8.53.0",
-    "@typescript-eslint/parser": "8.53.0",
    "@vitejs/plugin-react": "5.1.2",
    "@vitest/browser": "4.1.8",
    "@vitest/browser-playwright": "4.1.8",
@@ -143,14 +141,14 @@
    "dotenv-expand": "12.0.3",
    "eslint": "9.39.2",
    "eslint-config-prettier": "10.1.5",
+    "eslint-import-resolver-typescript": "4.4.4",
+    "eslint-plugin-import-x": "4.16.2",
    "eslint-plugin-jsx-a11y": "6.10.2",
-    "eslint-plugin-prettier": "5.5.1",
    "eslint-plugin-react": "7.37.5",
    "eslint-plugin-react-hooks": "7.0.1",
    "eslint-plugin-security": "3.0.1",
-    "eslint-plugin-simple-import-sort": "12.1.1",
-    "eslint-plugin-unused-imports": "4.3.0",
    "globals": "17.0.0",
+    "jiti": "2.7.0",
    "jsdom": "27.4.0",
    "knip": "6.3.1",
    "msw": "2.13.4",
@@ -160,6 +158,7 @@
    "prettier-plugin-tailwindcss": "0.6.14",
    "tailwindcss": "4.1.18",
    "typescript": "5.5.4",
+    "typescript-eslint": "8.59.3",
    "vitest": "4.1.8",
    "vitest-browser-react": "2.0.4"
  },
@@ -24,7 +24,7 @@
    "strict": true,
    "target": "es5"
  },
-  "exclude": ["node_modules", "vitest.config.ts"],
+  "exclude": ["node_modules", "vitest.config.ts", "eslint.config.ts"],
  "include": [
    "next-env.d.ts",
    "**/*.ts",