From dd68560ad07025df8be9929bd0308930d5e6ec9a Mon Sep 17 00:00:00 2001 From: Chaim Lev-Ari Date: Wed, 13 May 2026 16:39:58 +0300 Subject: [PATCH] chore(deps): upgrade prettier (#2592) Co-authored-by: Claude Sonnet 4.6 --- app/__mocks__/i18next.test.ts | 2 +- .../views/services/edit/serviceController.js | 5 +- app/index.html | 2 +- app/react/common/api/sort.types.ts | 2 +- app/react/components/Sheet.tsx | 3 +- .../SortableList/sortable-list.store.ts | 3 +- app/react/components/buttons/Button.tsx | 3 +- app/react/components/buttons/MenuButton.tsx | 3 +- .../datatables/ExpandableDatatable.tsx | 6 +- app/react/components/datatables/types.ts | 6 +- .../form-components/Input/Select.tsx | 5 +- .../form-components/PortainerSelect.tsx | 3 +- app/react/components/modals/confirm.ts | 6 +- .../ListView/ContainersDatatable/types.ts | 3 +- .../host/BrowseView/AgentHostBrowser.tsx | 9 +- .../ImagesDatatable/ImagesDatatable.tsx | 3 +- .../TasksDatatable/TasksDatatable.tsx | 3 +- .../stacks/ListView/StacksDatatable/store.ts | 3 +- .../volumes/BrowseView/AgentVolumeBrowser.tsx | 9 +- .../VolumesDatatable/VolumesDatatable.tsx | 3 +- .../ResultsDatatable/datatable-store.ts | 3 +- .../useAllowKubeToSelectCompose.ts | 4 +- .../ListView/EdgeStacksDatatable/store.ts | 3 +- .../ingress/AppIngressPathForm.tsx | 6 +- .../ApplicationIngressesTable.tsx | 19 ++- .../ApplicationsDatatable/PublishedPorts.tsx | 5 +- .../ClusterResourceReservation.test.tsx | 3 +- .../IngressClassDatatable/types.ts | 6 +- .../ConfigMapsDatatable.tsx | 4 +- .../SecretsDatatable/SecretsDatatable.tsx | 4 +- .../queries/useSecretsLinkedToDefaultSA.ts | 9 +- .../datatables/DefaultDatatableSettings.tsx | 3 +- .../ChartActions/UpgradeButton.tsx | 2 +- .../ReleaseDetails/ValuesDetails.tsx | 12 +- app/react/kubernetes/ingresses/types.ts | 3 +- .../CronJobsDatatable/CronJobsDatatable.tsx | 3 +- .../JobsView/JobsDatatable/JobsDatatable.tsx | 3 +- .../RoleBindingsDatatable.tsx | 3 +- .../RolesDatatable/RolesDatatable.tsx | 3 +- .../ServiceAccountsDatatable.tsx | 3 +- .../ItemView/useNamespaceFormValues.ts | 9 +- .../portainer/HomeView/useHomeViewState.ts | 2 +- .../account/git-credentials/types.ts | 3 +- .../ListView/datatable-store.ts | 3 +- .../environment-types.ts | 3 +- .../gitops/hooks/useGitRepoValidity.ts | 2 +- app/react/sidebar/useSidebarState.tsx | 5 +- app/types.ts | 4 +- app/types/deepPick.ts | 10 +- app/types/toTuple.ts | 12 +- app/types/utils.ts | 4 +- package.json | 4 +- pnpm-lock.yaml | 118 +++++++++--------- 53 files changed, 171 insertions(+), 191 deletions(-) diff --git a/app/__mocks__/i18next.test.ts b/app/__mocks__/i18next.test.ts index a1dbf0bf74..e6cc9707f5 100644 --- a/app/__mocks__/i18next.test.ts +++ b/app/__mocks__/i18next.test.ts @@ -19,7 +19,7 @@ describe('mockT', () => { ${'{{number}} of {{total}}'} | ${{ number: 0, total: 999 }} | ${'0 of 999'} ${'There was an error:\n{{error}}'} | ${{ error: 'Failed' }} | ${'There was an error:\nFailed'} ${'Click:{{li}}{{li2}}{{li_3}}'} | ${{ li: '', li2: 'https://', li_3: '!@#$%' }} | ${'Click:https://!@#$%'} - ${'{{happy}}😏y✔{{sad}}{{laugh}}'} | ${{ happy: '😃', sad: '😢', laugh: '🤣' }} | ${'😃😏y✔😢🤣'} + ${'{{happy}}😏y✔{{sad}}{{laugh}}'} | ${{ happy: '😃', sad: '😢', laugh: '🤣' }} | ${'😃😏y✔😢🤣'} `( 'should return correctly while handling arguments in different scenarios', ({ testText, args, expectedText }) => { diff --git a/app/docker/views/services/edit/serviceController.js b/app/docker/views/services/edit/serviceController.js index 74fb535c3e..227d47bb0a 100644 --- a/app/docker/views/services/edit/serviceController.js +++ b/app/docker/views/services/edit/serviceController.js @@ -553,13 +553,12 @@ angular.module('portainer.docker').controller('ServiceController', [ Mode: (config.EndpointSpec && config.EndpointSpec.Mode) || 'vip', Ports: service.Ports, }; - return service, config; + return config; } function rollbackService(service) { $scope.state.rollbackInProgress = true; - let config = {}; - service, (config = buildChanges(service)); + const config = buildChanges(service); ServiceService.update(service, config, 'previous') .then(function (data) { if (data.message && data.message.match(/^rpc error:/)) { diff --git a/app/index.html b/app/index.html index 5b1aa65602..a0d0b6652d 100644 --- a/app/index.html +++ b/app/index.html @@ -32,7 +32,7 @@ id="page-wrapper" ng-class="{ open: isSidebarOpen() && ['portainer.auth', 'portainer.init.admin', 'kubernetes.kubectlshell'].indexOf($state.current.name) === -1, - nopadding: ['portainer.auth', 'portainer.init.admin', 'portainer.logout', 'kubernetes.kubectlshell'].indexOf($state.current.name) > -1 || applicationState.loading + nopadding: ['portainer.auth', 'portainer.init.admin', 'portainer.logout', 'kubernetes.kubectlshell'].indexOf($state.current.name) > -1 || applicationState.loading, }" ng-cloak > diff --git a/app/react/common/api/sort.types.ts b/app/react/common/api/sort.types.ts index bccfff1c83..78607aee0d 100644 --- a/app/react/common/api/sort.types.ts +++ b/app/react/common/api/sort.types.ts @@ -133,7 +133,7 @@ export function sortOptionsFromColumns( ): SortOptions { return compact( columns.map((c) => - c.enableSorting === false ? undefined : c.id ?? c.accessorKey + c.enableSorting === false ? undefined : (c.id ?? c.accessorKey) ) ); } diff --git a/app/react/components/Sheet.tsx b/app/react/components/Sheet.tsx index d5a5f2a1e3..aee4815fb7 100644 --- a/app/react/components/Sheet.tsx +++ b/app/react/components/Sheet.tsx @@ -95,7 +95,8 @@ const sheetVariants = cva( ); interface SheetContentProps - extends ComponentPropsWithoutRef, + extends + ComponentPropsWithoutRef, VariantProps { showCloseButton?: boolean; } diff --git a/app/react/components/SortableList/sortable-list.store.ts b/app/react/components/SortableList/sortable-list.store.ts index 470fde3882..583ab8afb2 100644 --- a/app/react/components/SortableList/sortable-list.store.ts +++ b/app/react/components/SortableList/sortable-list.store.ts @@ -11,8 +11,7 @@ import { import { useTableState, TableState } from '@@/datatables/useTableState'; interface SortableListSettings - extends BasicTableSettings, - BackendPaginationTableSettings { + extends BasicTableSettings, BackendPaginationTableSettings { groupBy: string | null; setGroupBy: (group: string | null) => void; groupFilter: string | null; diff --git a/app/react/components/buttons/Button.tsx b/app/react/components/buttons/Button.tsx index 654d5f6f81..d8fd63c70b 100644 --- a/app/react/components/buttons/Button.tsx +++ b/app/react/components/buttons/Button.tsx @@ -29,8 +29,7 @@ type Color = type Size = 'xsmall' | 'small' | 'medium' | 'large'; export interface Props - extends AriaAttributes, - AutomationTestingProps { + extends AriaAttributes, AutomationTestingProps { icon?: ReactNode | ComponentType; color?: Color; diff --git a/app/react/components/buttons/MenuButton.tsx b/app/react/components/buttons/MenuButton.tsx index 765bb1d88e..0946bd5883 100644 --- a/app/react/components/buttons/MenuButton.tsx +++ b/app/react/components/buttons/MenuButton.tsx @@ -16,8 +16,7 @@ import { Icon } from '@@/Icon'; import { Props as ButtonProps, ButtonWithRef } from './Button'; export interface MenuButtonProps - extends Omit, - AutomationTestingProps { + extends Omit, AutomationTestingProps { items: Array; menuClassName?: string; dropdownPosition?: 'left' | 'right'; diff --git a/app/react/components/datatables/ExpandableDatatable.tsx b/app/react/components/datatables/ExpandableDatatable.tsx index 56ab2e3947..e8e35f7cb8 100644 --- a/app/react/components/datatables/ExpandableDatatable.tsx +++ b/app/react/components/datatables/ExpandableDatatable.tsx @@ -9,8 +9,10 @@ import { } from './Datatable'; import { DefaultType } from './types'; -interface Props - extends Omit, 'renderRow' | 'expandable'> { +interface Props extends Omit< + DatatableProps, + 'renderRow' | 'expandable' +> { renderSubRow(row: Row): ReactNode; expandOnRowClick?: boolean; } diff --git a/app/react/components/datatables/types.ts b/app/react/components/datatables/types.ts index e15ed06fa4..621763713b 100644 --- a/app/react/components/datatables/types.ts +++ b/app/react/components/datatables/types.ts @@ -119,12 +119,10 @@ export function filteredColumnsSettings( } export interface BasicTableSettings - extends SortableTableSettings, - PaginationTableSettings {} + extends SortableTableSettings, PaginationTableSettings {} export interface TableSettingsWithRefreshable - extends BasicTableSettings, - RefreshableTableSettings {} + extends BasicTableSettings, RefreshableTableSettings {} export function createPersistedStore( storageKey: string, diff --git a/app/react/components/form-components/Input/Select.tsx b/app/react/components/form-components/Input/Select.tsx index 8c9d11b7b1..b6db7ef72b 100644 --- a/app/react/components/form-components/Input/Select.tsx +++ b/app/react/components/form-components/Input/Select.tsx @@ -3,8 +3,9 @@ import { SelectHTMLAttributes } from 'react'; import { AutomationTestingProps } from '@/types'; -export interface Option - extends Partial { +export interface Option< + T extends string | number, +> extends Partial { value: T; label: string; disabled?: boolean; diff --git a/app/react/components/form-components/PortainerSelect.tsx b/app/react/components/form-components/PortainerSelect.tsx index 1cf33aef00..827b36d247 100644 --- a/app/react/components/form-components/PortainerSelect.tsx +++ b/app/react/components/form-components/PortainerSelect.tsx @@ -33,8 +33,7 @@ type Options = OptionsOrGroups< >; interface SharedProps - extends AutomationTestingProps, - Pick { + extends AutomationTestingProps, Pick { name?: string; inputId?: string; size?: 'sm' | 'md'; diff --git a/app/react/components/modals/confirm.ts b/app/react/components/modals/confirm.ts index c7f3ba6774..13db333a64 100644 --- a/app/react/components/modals/confirm.ts +++ b/app/react/components/modals/confirm.ts @@ -7,8 +7,10 @@ import { buildCancelButton, buildConfirmButton } from './utils'; export type ConfirmCallback = OnSubmit; -export interface ConfirmOptions - extends Omit, 'title' | 'buttons'> { +export interface ConfirmOptions extends Omit< + DialogOptions, + 'title' | 'buttons' +> { title: string; confirmButton?: ButtonOptions; cancelButtonLabel?: string; diff --git a/app/react/docker/containers/ListView/ContainersDatatable/types.ts b/app/react/docker/containers/ListView/ContainersDatatable/types.ts index ec1919034b..8ea405d61a 100644 --- a/app/react/docker/containers/ListView/ContainersDatatable/types.ts +++ b/app/react/docker/containers/ListView/ContainersDatatable/types.ts @@ -13,7 +13,8 @@ export interface SettableQuickActionsTableSettings { } export interface TableSettings - extends BasicTableSettings, + extends + BasicTableSettings, SettableColumnsTableSettings, SettableQuickActionsTableSettings, RefreshableTableSettings, diff --git a/app/react/docker/host/BrowseView/AgentHostBrowser.tsx b/app/react/docker/host/BrowseView/AgentHostBrowser.tsx index f65f48f66f..d1c44b82e8 100644 --- a/app/react/docker/host/BrowseView/AgentHostBrowser.tsx +++ b/app/react/docker/host/BrowseView/AgentHostBrowser.tsx @@ -12,11 +12,10 @@ const settingsStore = createPersistedStore(tableKey, { id: 'Dir', }); -interface Props - extends Omit< - ComponentProps, - 'isUploadAllowed' | 'tableState' | 'title' - > { +interface Props extends Omit< + ComponentProps, + 'isUploadAllowed' | 'tableState' | 'title' +> { relativePath: string; } diff --git a/app/react/docker/images/ListView/ImagesDatatable/ImagesDatatable.tsx b/app/react/docker/images/ListView/ImagesDatatable/ImagesDatatable.tsx index 1926ffb818..779435bdf3 100644 --- a/app/react/docker/images/ListView/ImagesDatatable/ImagesDatatable.tsx +++ b/app/react/docker/images/ListView/ImagesDatatable/ImagesDatatable.tsx @@ -30,7 +30,8 @@ import { PruneButton } from './PruneButton'; const tableKey = 'images'; export interface TableSettings - extends BasicTableSettings, + extends + BasicTableSettings, RefreshableTableSettings, FilteredColumnsTableSettings {} diff --git a/app/react/docker/services/ItemView/TasksDatatable/TasksDatatable.tsx b/app/react/docker/services/ItemView/TasksDatatable/TasksDatatable.tsx index cc1e21a374..f193a3d3c6 100644 --- a/app/react/docker/services/ItemView/TasksDatatable/TasksDatatable.tsx +++ b/app/react/docker/services/ItemView/TasksDatatable/TasksDatatable.tsx @@ -17,8 +17,7 @@ import { DecoratedTask } from './types'; const storageKey = 'docker-service-tasks'; interface TableSettings - extends BasicTableSettings, - FilteredColumnsTableSettings {} + extends BasicTableSettings, FilteredColumnsTableSettings {} export function TasksDatatable({ dataset, diff --git a/app/react/docker/stacks/ListView/StacksDatatable/store.ts b/app/react/docker/stacks/ListView/StacksDatatable/store.ts index 6546be6856..ecd457b9f6 100644 --- a/app/react/docker/stacks/ListView/StacksDatatable/store.ts +++ b/app/react/docker/stacks/ListView/StacksDatatable/store.ts @@ -10,7 +10,8 @@ import { import { useTableStateWithStorage } from '@@/datatables/useTableState'; export interface TableSettings - extends BasicTableSettings, + extends + BasicTableSettings, SettableColumnsTableSettings, RefreshableTableSettings, FilteredColumnsTableSettings { diff --git a/app/react/docker/volumes/BrowseView/AgentVolumeBrowser.tsx b/app/react/docker/volumes/BrowseView/AgentVolumeBrowser.tsx index c542dd21d6..2e001f5872 100644 --- a/app/react/docker/volumes/BrowseView/AgentVolumeBrowser.tsx +++ b/app/react/docker/volumes/BrowseView/AgentVolumeBrowser.tsx @@ -9,11 +9,10 @@ const tableKey = 'host-browser'; const settingsStore = createPersistedStore(tableKey, 'Name'); -interface Props - extends Omit< - ComponentProps, - 'onSearchChange' | 'tableState' | 'title' - > { +interface Props extends Omit< + ComponentProps, + 'onSearchChange' | 'tableState' | 'title' +> { relativePath: string; } diff --git a/app/react/docker/volumes/ListView/VolumesDatatable/VolumesDatatable.tsx b/app/react/docker/volumes/ListView/VolumesDatatable/VolumesDatatable.tsx index 19f371cb9e..6fd25e33af 100644 --- a/app/react/docker/volumes/ListView/VolumesDatatable/VolumesDatatable.tsx +++ b/app/react/docker/volumes/ListView/VolumesDatatable/VolumesDatatable.tsx @@ -22,7 +22,8 @@ import { TableActions } from './TableActions'; import { useColumns } from './columns'; interface TableSettings - extends BasicTableSettings, + extends + BasicTableSettings, RefreshableTableSettings, FilteredColumnsTableSettings {} diff --git a/app/react/edge/edge-jobs/ItemView/ResultsDatatable/datatable-store.ts b/app/react/edge/edge-jobs/ItemView/ResultsDatatable/datatable-store.ts index 2db1c21859..e76729883b 100644 --- a/app/react/edge/edge-jobs/ItemView/ResultsDatatable/datatable-store.ts +++ b/app/react/edge/edge-jobs/ItemView/ResultsDatatable/datatable-store.ts @@ -8,7 +8,8 @@ import { } from '@@/datatables/types'; interface TableSettings - extends BasicTableSettings, + extends + BasicTableSettings, RefreshableTableSettings, BackendPaginationTableSettings {} diff --git a/app/react/edge/edge-stacks/ItemView/EditEdgeStackForm/useAllowKubeToSelectCompose.ts b/app/react/edge/edge-stacks/ItemView/EditEdgeStackForm/useAllowKubeToSelectCompose.ts index 57ca78c9da..46bb8964f5 100644 --- a/app/react/edge/edge-stacks/ItemView/EditEdgeStackForm/useAllowKubeToSelectCompose.ts +++ b/app/react/edge/edge-stacks/ItemView/EditEdgeStackForm/useAllowKubeToSelectCompose.ts @@ -9,8 +9,8 @@ export function useAllowKubeToSelectCompose(edgeStack: EdgeStack) { const edgeGroupsQuery = useEdgeGroups(); const initiallyContainsKubeEnv = _.compact( - edgeStack.EdgeGroups.map( - (id) => edgeGroupsQuery.data?.find((e) => e.Id === id) + edgeStack.EdgeGroups.map((id) => + edgeGroupsQuery.data?.find((e) => e.Id === id) ) ) .flatMap((group) => group.EndpointTypes) diff --git a/app/react/edge/edge-stacks/ListView/EdgeStacksDatatable/store.ts b/app/react/edge/edge-stacks/ListView/EdgeStacksDatatable/store.ts index f254c56b43..e6d9a547ce 100644 --- a/app/react/edge/edge-stacks/ListView/EdgeStacksDatatable/store.ts +++ b/app/react/edge/edge-stacks/ListView/EdgeStacksDatatable/store.ts @@ -8,7 +8,8 @@ import { } from '@@/datatables/types'; export interface TableSettings - extends BasicTableSettings, + extends + BasicTableSettings, SettableColumnsTableSettings, RefreshableTableSettings {} diff --git a/app/react/kubernetes/applications/CreateView/application-services/ingress/AppIngressPathForm.tsx b/app/react/kubernetes/applications/CreateView/application-services/ingress/AppIngressPathForm.tsx index 9907f410d8..697920568c 100644 --- a/app/react/kubernetes/applications/CreateView/application-services/ingress/AppIngressPathForm.tsx +++ b/app/react/kubernetes/applications/CreateView/application-services/ingress/AppIngressPathForm.tsx @@ -72,15 +72,15 @@ export function AppIngressPathForm({ ); const newIngressHostValue = ingressHosts.includes(ingressPath?.Host ?? '') ? ingressPath?.Host - : ingressHosts[0] ?? ''; + : (ingressHosts[0] ?? ''); const ingressNames = ingressHostOptionsWithCurrentValue.map( (i) => i.ingressName ); const newIngressNameValue = ingressNames.includes( ingressPath?.IngressName ?? '' ) - ? ingressPath?.IngressName ?? '' - : ingressNames[0] ?? ''; + ? (ingressPath?.IngressName ?? '') + : (ingressNames[0] ?? ''); const newIngressPath = { ...ingressPath, diff --git a/app/react/kubernetes/applications/DetailsView/ApplicationDetailsWidget/ApplicationIngressesTable.tsx b/app/react/kubernetes/applications/DetailsView/ApplicationDetailsWidget/ApplicationIngressesTable.tsx index 92099f14e0..8fb7413ece 100644 --- a/app/react/kubernetes/applications/DetailsView/ApplicationDetailsWidget/ApplicationIngressesTable.tsx +++ b/app/react/kubernetes/applications/DetailsView/ApplicationDetailsWidget/ApplicationIngressesTable.tsx @@ -100,16 +100,15 @@ function getIngressPathsForAppServices( if (!ingress.Paths) { return []; } - const matchingIngressPaths = ingress.Paths?.filter( - (path) => - services?.some((service) => { - const servicePorts = service.spec?.ports?.map((port) => port.port); - // include the ingress if the ingress path has a matching service name and port - return ( - path.ServiceName === service.metadata?.name && - servicePorts?.includes(path.Port) - ); - }) + const matchingIngressPaths = ingress.Paths?.filter((path) => + services?.some((service) => { + const servicePorts = service.spec?.ports?.map((port) => port.port); + // include the ingress if the ingress path has a matching service name and port + return ( + path.ServiceName === service.metadata?.name && + servicePorts?.includes(path.Port) + ); + }) ).map((path) => { const secure = (ingress.TLS && diff --git a/app/react/kubernetes/applications/ListView/ApplicationsDatatable/PublishedPorts.tsx b/app/react/kubernetes/applications/ListView/ApplicationsDatatable/PublishedPorts.tsx index 9fdbc924b1..80309d5c14 100644 --- a/app/react/kubernetes/applications/ListView/ApplicationsDatatable/PublishedPorts.tsx +++ b/app/react/kubernetes/applications/ListView/ApplicationsDatatable/PublishedPorts.tsx @@ -43,8 +43,9 @@ function getClusterIPUrls(services?: Application['Services']) { (service) => (service.spec?.type === 'ClusterIP' && service.spec?.ports?.map((port) => ({ - url: `${getSchemeFromPort(port.port)}://${service?.spec - ?.clusterIP}:${port.port}`, + url: `${getSchemeFromPort(port.port)}://${ + service?.spec?.clusterIP + }:${port.port}`, type: 'ClusterIP', }))) || [] diff --git a/app/react/kubernetes/cluster/ClusterView/ClusterResourceReservation.test.tsx b/app/react/kubernetes/cluster/ClusterView/ClusterResourceReservation.test.tsx index 61dfabd6c8..efe92e6b8b 100644 --- a/app/react/kubernetes/cluster/ClusterView/ClusterResourceReservation.test.tsx +++ b/app/react/kubernetes/cluster/ClusterView/ClusterResourceReservation.test.tsx @@ -141,8 +141,7 @@ describe('ClusterResourceReservation', () => { it('should not display resource usage if metrics server is not enabled', async () => { const disabledMetricsEnvironment = createMockEnvironment(); - disabledMetricsEnvironment.Kubernetes.Configuration.UseServerMetrics = - false; + disabledMetricsEnvironment.Kubernetes.Configuration.UseServerMetrics = false; mockUseCurrentEnvironment.mockReturnValue( createMockQueryResult(disabledMetricsEnvironment) ); diff --git a/app/react/kubernetes/cluster/ingressClass/IngressClassDatatable/types.ts b/app/react/kubernetes/cluster/ingressClass/IngressClassDatatable/types.ts index f9903c8ba5..82f8774894 100644 --- a/app/react/kubernetes/cluster/ingressClass/IngressClassDatatable/types.ts +++ b/app/react/kubernetes/cluster/ingressClass/IngressClassDatatable/types.ts @@ -4,8 +4,7 @@ import { } from '@/react/components/datatables/types'; export interface TableSettings - extends SortableTableSettings, - PaginationTableSettings {} + extends SortableTableSettings, PaginationTableSettings {} export type SupportedIngControllerTypes = | 'nginx' @@ -25,5 +24,4 @@ export interface IngressControllerClassMap { // Record fixes type errors when using the type with a react datatable export interface IngressControllerClassMapRowData - extends Record, - IngressControllerClassMap {} + extends Record, IngressControllerClassMap {} diff --git a/app/react/kubernetes/configs/ListView/ConfigMapsDatatable/ConfigMapsDatatable.tsx b/app/react/kubernetes/configs/ListView/ConfigMapsDatatable/ConfigMapsDatatable.tsx index 717cd5fece..0dbea26167 100644 --- a/app/react/kubernetes/configs/ListView/ConfigMapsDatatable/ConfigMapsDatatable.tsx +++ b/app/react/kubernetes/configs/ListView/ConfigMapsDatatable/ConfigMapsDatatable.tsx @@ -98,9 +98,9 @@ function useConfigMapRowData( ...configMap, inUse: configMap.IsUsed, isSystem: namespaces - ? namespaces.find( + ? (namespaces.find( (namespace) => namespace.Name === configMap.Namespace - )?.IsSystem ?? false + )?.IsSystem ?? false) : false, })) || [], [configMaps, namespaces] diff --git a/app/react/kubernetes/configs/ListView/SecretsDatatable/SecretsDatatable.tsx b/app/react/kubernetes/configs/ListView/SecretsDatatable/SecretsDatatable.tsx index 8fc6887c59..1c15eb5589 100644 --- a/app/react/kubernetes/configs/ListView/SecretsDatatable/SecretsDatatable.tsx +++ b/app/react/kubernetes/configs/ListView/SecretsDatatable/SecretsDatatable.tsx @@ -108,9 +108,9 @@ function useSecretRowData( ...secret, inUse: secret.IsUsed, isSystem: namespaces - ? namespaces.find( + ? (namespaces.find( (namespace) => namespace.Name === secret.Namespace - )?.IsSystem ?? false + )?.IsSystem ?? false) : false, registryId, }; diff --git a/app/react/kubernetes/configs/secrets/queries/useSecretsLinkedToDefaultSA.ts b/app/react/kubernetes/configs/secrets/queries/useSecretsLinkedToDefaultSA.ts index 11793ea048..59b7f4959c 100644 --- a/app/react/kubernetes/configs/secrets/queries/useSecretsLinkedToDefaultSA.ts +++ b/app/react/kubernetes/configs/secrets/queries/useSecretsLinkedToDefaultSA.ts @@ -15,11 +15,10 @@ export function useSecretsLinkedToDefaultSA(namespace: string) { namespace: string ) { return registries - .filter( - (registry) => - registry.RegistryAccesses?.[environmentId]?.Namespaces?.includes( - namespace - ) + .filter((registry) => + registry.RegistryAccesses?.[environmentId]?.Namespaces?.includes( + namespace + ) ) .map((registry) => `registry-${registry.Id}`); } diff --git a/app/react/kubernetes/datatables/DefaultDatatableSettings.tsx b/app/react/kubernetes/datatables/DefaultDatatableSettings.tsx index 30acd6e993..45644527ed 100644 --- a/app/react/kubernetes/datatables/DefaultDatatableSettings.tsx +++ b/app/react/kubernetes/datatables/DefaultDatatableSettings.tsx @@ -10,7 +10,8 @@ import { } from './SystemResourcesSettings'; export interface TableSettings - extends BasicTableSettings, + extends + BasicTableSettings, RefreshableTableSettings, SystemResourcesTableSettings {} diff --git a/app/react/kubernetes/helm/HelmApplicationView/ChartActions/UpgradeButton.tsx b/app/react/kubernetes/helm/HelmApplicationView/ChartActions/UpgradeButton.tsx index 9841280ffd..b62dbe7cf7 100644 --- a/app/react/kubernetes/helm/HelmApplicationView/ChartActions/UpgradeButton.tsx +++ b/app/react/kubernetes/helm/HelmApplicationView/ChartActions/UpgradeButton.tsx @@ -68,7 +68,7 @@ export function UpgradeButton({ const latestVersionAvailable = versions[0]?.Version ?? ''; const isNewVersionAvailable = Boolean( latestVersionQuery?.data && - semverCompare(latestVersionAvailable, latestVersionQuery?.data) === 1 + semverCompare(latestVersionAvailable, latestVersionQuery?.data) === 1 ); const currentRepo = versions?.find( diff --git a/app/react/kubernetes/helm/HelmApplicationView/ReleaseDetails/ValuesDetails.tsx b/app/react/kubernetes/helm/HelmApplicationView/ReleaseDetails/ValuesDetails.tsx index 7a480660c3..6aea145680 100644 --- a/app/react/kubernetes/helm/HelmApplicationView/ReleaseDetails/ValuesDetails.tsx +++ b/app/react/kubernetes/helm/HelmApplicationView/ReleaseDetails/ValuesDetails.tsx @@ -41,8 +41,8 @@ export function ValuesDetails({ data-cy="values-details-code-editor" value={ isUserSupplied - ? values?.userSuppliedValues ?? '' - : values?.computedValues ?? '' + ? (values?.userSuppliedValues ?? '') + : (values?.computedValues ?? '') } readonly fileName={`Revision #${selectedRevisionNumber}`} @@ -57,13 +57,13 @@ export function ValuesDetails({ selectedRevisionNumber={selectedRevisionNumber} newText={ isUserSupplied - ? values?.userSuppliedValues ?? '' - : values?.computedValues ?? '' + ? (values?.userSuppliedValues ?? '') + : (values?.computedValues ?? '') } originalText={ isUserSupplied - ? compareValues?.userSuppliedValues ?? '' - : compareValues?.computedValues ?? '' + ? (compareValues?.userSuppliedValues ?? '') + : (compareValues?.computedValues ?? '') } id="values-details-diff-viewer" data-cy="values-details-diff-viewer" diff --git a/app/react/kubernetes/ingresses/types.ts b/app/react/kubernetes/ingresses/types.ts index 8e9b434840..43ae70190b 100644 --- a/app/react/kubernetes/ingresses/types.ts +++ b/app/react/kubernetes/ingresses/types.ts @@ -5,8 +5,7 @@ import { import { SupportedIngControllerTypes } from '@/react/kubernetes/cluster/ingressClass/types'; export interface TableSettings - extends SortableTableSettings, - PaginationTableSettings {} + extends SortableTableSettings, PaginationTableSettings {} export interface Path { IngressName: string; diff --git a/app/react/kubernetes/more-resources/JobsView/CronJobsDatatable/CronJobsDatatable.tsx b/app/react/kubernetes/more-resources/JobsView/CronJobsDatatable/CronJobsDatatable.tsx index c9dc4ccd70..a8e8b6ab84 100644 --- a/app/react/kubernetes/more-resources/JobsView/CronJobsDatatable/CronJobsDatatable.tsx +++ b/app/react/kubernetes/more-resources/JobsView/CronJobsDatatable/CronJobsDatatable.tsx @@ -35,8 +35,7 @@ import { CronJobsExecutionsInnerDatatable } from './CronJobsExecutionsInnerDatat const storageKey = 'cronJobs'; interface TableSettings - extends KubeTableSettings, - FilteredColumnsTableSettings {} + extends KubeTableSettings, FilteredColumnsTableSettings {} interface CronJobsExecutionsProps { item: Job[]; diff --git a/app/react/kubernetes/more-resources/JobsView/JobsDatatable/JobsDatatable.tsx b/app/react/kubernetes/more-resources/JobsView/JobsDatatable/JobsDatatable.tsx index a149bd5e77..2bd064475d 100644 --- a/app/react/kubernetes/more-resources/JobsView/JobsDatatable/JobsDatatable.tsx +++ b/app/react/kubernetes/more-resources/JobsView/JobsDatatable/JobsDatatable.tsx @@ -31,8 +31,7 @@ import { useDeleteJobsMutation } from './queries/useDeleteJobsMutation'; const storageKey = 'jobs'; interface TableSettings - extends KubeTableSettings, - FilteredColumnsTableSettings {} + extends KubeTableSettings, FilteredColumnsTableSettings {} export function JobsDatatable() { const environmentId = useEnvironmentId(); diff --git a/app/react/kubernetes/more-resources/RolesView/RoleBindingsDatatable/RoleBindingsDatatable.tsx b/app/react/kubernetes/more-resources/RolesView/RoleBindingsDatatable/RoleBindingsDatatable.tsx index 31240ab56b..9b57b02cd5 100644 --- a/app/react/kubernetes/more-resources/RolesView/RoleBindingsDatatable/RoleBindingsDatatable.tsx +++ b/app/react/kubernetes/more-resources/RolesView/RoleBindingsDatatable/RoleBindingsDatatable.tsx @@ -30,8 +30,7 @@ import { useDeleteRoleBindingsMutation } from './queries/useDeleteRoleBindingsMu const storageKey = 'roleBindings'; interface TableSettings - extends KubeTableSettings, - FilteredColumnsTableSettings {} + extends KubeTableSettings, FilteredColumnsTableSettings {} export function RoleBindingsDatatable() { const environmentId = useEnvironmentId(); diff --git a/app/react/kubernetes/more-resources/RolesView/RolesDatatable/RolesDatatable.tsx b/app/react/kubernetes/more-resources/RolesView/RolesDatatable/RolesDatatable.tsx index caa98b4c51..bf5903d9aa 100644 --- a/app/react/kubernetes/more-resources/RolesView/RolesDatatable/RolesDatatable.tsx +++ b/app/react/kubernetes/more-resources/RolesView/RolesDatatable/RolesDatatable.tsx @@ -31,8 +31,7 @@ import { useDeleteRolesMutation } from './queries/useDeleteRolesMutation'; const storageKey = 'roles'; interface TableSettings - extends KubeTableSettings, - FilteredColumnsTableSettings {} + extends KubeTableSettings, FilteredColumnsTableSettings {} export function RolesDatatable() { const environmentId = useEnvironmentId(); diff --git a/app/react/kubernetes/more-resources/ServiceAccountsView/ServiceAccountsDatatable/ServiceAccountsDatatable.tsx b/app/react/kubernetes/more-resources/ServiceAccountsView/ServiceAccountsDatatable/ServiceAccountsDatatable.tsx index 09d691be61..2b467ba020 100644 --- a/app/react/kubernetes/more-resources/ServiceAccountsView/ServiceAccountsDatatable/ServiceAccountsDatatable.tsx +++ b/app/react/kubernetes/more-resources/ServiceAccountsView/ServiceAccountsDatatable/ServiceAccountsDatatable.tsx @@ -28,8 +28,7 @@ import { useGetAllServiceAccountsQuery } from './queries/useGetAllServiceAccount const storageKey = 'serviceAccounts'; interface TableSettings - extends KubeTableSettings, - FilteredColumnsTableSettings {} + extends KubeTableSettings, FilteredColumnsTableSettings {} export function ServiceAccountsDatatable() { const environmentId = useEnvironmentId(); diff --git a/app/react/kubernetes/namespaces/ItemView/useNamespaceFormValues.ts b/app/react/kubernetes/namespaces/ItemView/useNamespaceFormValues.ts index c318ea0dc8..a203c18a81 100644 --- a/app/react/kubernetes/namespaces/ItemView/useNamespaceFormValues.ts +++ b/app/react/kubernetes/namespaces/ItemView/useNamespaceFormValues.ts @@ -30,11 +30,10 @@ export function computeInitialValues({ const memory = namespace.ResourceQuota?.spec?.hard?.['requests.memory'] ?? ''; const cpu = namespace.ResourceQuota?.spec?.hard?.['requests.cpu'] ?? ''; - const registriesUsed = registries?.filter( - (registry) => - registry.RegistryAccesses?.[`${environmentId}`]?.Namespaces.includes( - namespaceName - ) + const registriesUsed = registries?.filter((registry) => + registry.RegistryAccesses?.[`${environmentId}`]?.Namespaces.includes( + namespaceName + ) ); return { diff --git a/app/react/portainer/HomeView/useHomeViewState.ts b/app/react/portainer/HomeView/useHomeViewState.ts index ff8542d684..c36a992411 100644 --- a/app/react/portainer/HomeView/useHomeViewState.ts +++ b/app/react/portainer/HomeView/useHomeViewState.ts @@ -21,7 +21,7 @@ export function useHomeViewState() { buildExtra: (urlState, setUrlState) => { return { groupKey: urlState.groupBy - ? getSortTypeCaseInsensitive(urlState.groupBy) ?? DEFAULT_SORT + ? (getSortTypeCaseInsensitive(urlState.groupBy) ?? DEFAULT_SORT) : DEFAULT_SORT, setHeaderFilter: (sortBy, filter) => { setUrlState({ diff --git a/app/react/portainer/account/git-credentials/types.ts b/app/react/portainer/account/git-credentials/types.ts index 713bde7314..f48bbf3ca0 100644 --- a/app/react/portainer/account/git-credentials/types.ts +++ b/app/react/portainer/account/git-credentials/types.ts @@ -4,8 +4,7 @@ import { } from '@@/datatables/types'; export interface GitCredentialTableSettings - extends SortableTableSettings, - PaginationTableSettings {} + extends SortableTableSettings, PaginationTableSettings {} export enum AuthTypeOption { Basic = 0, diff --git a/app/react/portainer/environments/update-schedules/ListView/datatable-store.ts b/app/react/portainer/environments/update-schedules/ListView/datatable-store.ts index 3ce9edc8c3..047a092e6c 100644 --- a/app/react/portainer/environments/update-schedules/ListView/datatable-store.ts +++ b/app/react/portainer/environments/update-schedules/ListView/datatable-store.ts @@ -8,7 +8,8 @@ import { } from '@/react/components/datatables/types'; interface TableSettings - extends BasicTableSettings, + extends + BasicTableSettings, SettableColumnsTableSettings, RefreshableTableSettings {} diff --git a/app/react/portainer/environments/wizard/EnvironmentTypeSelectView/environment-types.ts b/app/react/portainer/environments/wizard/EnvironmentTypeSelectView/environment-types.ts index 9c590687cf..c39bdc5156 100644 --- a/app/react/portainer/environments/wizard/EnvironmentTypeSelectView/environment-types.ts +++ b/app/react/portainer/environments/wizard/EnvironmentTypeSelectView/environment-types.ts @@ -17,8 +17,7 @@ export type EnvironmentOptionValue = | 'kaas' | 'k8sInstall'; -export interface EnvironmentOption - extends BoxSelectorOption { +export interface EnvironmentOption extends BoxSelectorOption { id: EnvironmentOptionValue; value: EnvironmentOptionValue; } diff --git a/app/react/portainer/gitops/hooks/useGitRepoValidity.ts b/app/react/portainer/gitops/hooks/useGitRepoValidity.ts index 7237cdf63d..e11819a829 100644 --- a/app/react/portainer/gitops/hooks/useGitRepoValidity.ts +++ b/app/react/portainer/gitops/hooks/useGitRepoValidity.ts @@ -82,7 +82,7 @@ export function getGitValidityError(error: unknown, hasCreds: boolean) { if (!isAxiosError(error)) return undefined; const responseData = error.response?.data; const details = isDefaultResponse(responseData) - ? responseData.details ?? '' + ? (responseData.details ?? '') : ''; if ( !hasCreds && diff --git a/app/react/sidebar/useSidebarState.tsx b/app/react/sidebar/useSidebarState.tsx index c7e1fa90e6..a3c012b3e6 100644 --- a/app/react/sidebar/useSidebarState.tsx +++ b/app/react/sidebar/useSidebarState.tsx @@ -77,9 +77,8 @@ function useSidebarStateLocal() { storageKey, true ); - const [isOpen, setIsOpen, undoIsOpenChange] = useStateWithUndo( - initialState() - ); + const [isOpen, setIsOpen, undoIsOpenChange] = + useStateWithUndo(initialState()); const onResize = useMemo( () => diff --git a/app/types.ts b/app/types.ts index 37fc4574f0..cb643fe0eb 100644 --- a/app/types.ts +++ b/app/types.ts @@ -9,9 +9,7 @@ export interface AutomationTestingProps { declare module 'react' { interface HTMLAttributes - extends AriaAttributes, - DOMAttributes, - Partial { + extends AriaAttributes, DOMAttributes, Partial { // keep AutomationTestingProps 'data-cy' optional because HTMLAttributes covers non interactive elements } } diff --git a/app/types/deepPick.ts b/app/types/deepPick.ts index 2766153041..80c6e417bd 100644 --- a/app/types/deepPick.ts +++ b/app/types/deepPick.ts @@ -47,8 +47,8 @@ export type DeepPick = Prettify< P extends string ? DeepPickFromString, P> : P extends string[] - ? DeepPickFromArray, P> - : never + ? DeepPickFromArray, P> + : never >; /** @@ -64,10 +64,8 @@ type DeepPickFromString = DeepPickFromArray< * Transform union of path-arrays to tuple of path-arrays * from `['a', 'b', 'c'] | ['c' | 'd' | 'e']` to `[['a', 'b', 'c'], ['c' | 'd' | 'e']]` */ -type DeepPickFromArray< - T extends object, - P extends string[], -> = ToTuple

extends string[][] ? DeepPickRec> : never; +type DeepPickFromArray = + ToTuple

extends string[][] ? DeepPickRec> : never; // Recursively pick each path-array of tuple and union the resulting types type DeepPickRec = P[0] extends string[] diff --git a/app/types/toTuple.ts b/app/types/toTuple.ts index a62896b921..18dd14043e 100644 --- a/app/types/toTuple.ts +++ b/app/types/toTuple.ts @@ -9,9 +9,10 @@ export type ToTuple = ToTupleRec; // Recursively build a tuple from a union -type ToTupleRec = SpliceOne extends never - ? [ExtractOne, ...Result] - : ToTupleRec, [ExtractOne, ...Result]>; +type ToTupleRec = + SpliceOne extends never + ? [ExtractOne, ...Result] + : ToTupleRec, [ExtractOne, ...Result]>; // Remove the first element of union type SpliceOne = Exclude>; @@ -67,9 +68,8 @@ type ExtractParam = F extends { (a: infer A): void } ? A : never; * ``` * */ -type UnionToIntersection = UnionToParam extends (k: infer I) => void - ? I - : never; +type UnionToIntersection = + UnionToParam extends (k: infer I) => void ? I : never; /** * Transform T to `(k: T) => void` (excluding never) diff --git a/app/types/utils.ts b/app/types/utils.ts index eaa7213e45..e29a433bcf 100644 --- a/app/types/utils.ts +++ b/app/types/utils.ts @@ -4,8 +4,8 @@ export type PathToStringArray = T extends string[] ? T : T extends `${infer Head}.${infer Tail}` - ? [...PathToStringArray, ...PathToStringArray] - : [T]; + ? [...PathToStringArray, ...PathToStringArray] + : [T]; /** * VSCode helper to recursively pretty print the constructed types instead of diff --git a/package.json b/package.json index 2b02ee7c43..fa6feee2cf 100644 --- a/package.json +++ b/package.json @@ -218,8 +218,8 @@ "ngtemplate-loader": "^2.1.0", "postcss": "^8.5.6", "postcss-loader": "^7.3.3", - "prettier": "^3.0.3", - "prettier-plugin-tailwindcss": "^0.6.14", + "prettier": "^3.8.3", + "prettier-plugin-tailwindcss": "^0.8.0", "react-docgen-typescript-plugin": "^1.0.5", "source-map-loader": "^4.0.1", "speed-measure-webpack-plugin": "^1.5.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 91887f4f1d..ea31484563 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -355,7 +355,7 @@ importers: version: 7.23.0(@babel/core@7.23.6) '@chromatic-com/storybook': specifier: ^5.1.2 - version: 5.1.2(storybook@10.3.5(@testing-library/dom@9.3.4)(prettier@3.0.3)(react-dom@17.0.2(react@17.0.2))(react@17.0.2)) + version: 5.1.2(storybook@10.3.5(@testing-library/dom@9.3.4)(prettier@3.8.3)(react-dom@17.0.2(react@17.0.2))(react@17.0.2)) '@eslint-community/eslint-plugin-eslint-comments': specifier: ^4.7.1 version: 4.7.1(eslint@9.39.4) @@ -373,19 +373,19 @@ importers: version: 2.0.0(react@17.0.2) '@storybook/addon-docs': specifier: 10.3.5 - version: 10.3.5(@types/react@17.0.75)(esbuild@0.27.3)(rollup@4.54.0)(storybook@10.3.5(@testing-library/dom@9.3.4)(prettier@3.0.3)(react-dom@17.0.2(react@17.0.2))(react@17.0.2))(vite@8.0.8(@types/node@25.0.3)(esbuild@0.27.3)(less@4.4.2)(terser@5.44.1)(yaml@1.10.2))(webpack@5.105.0) + version: 10.3.5(@types/react@17.0.75)(esbuild@0.27.3)(rollup@4.54.0)(storybook@10.3.5(@testing-library/dom@9.3.4)(prettier@3.8.3)(react-dom@17.0.2(react@17.0.2))(react@17.0.2))(vite@8.0.8(@types/node@25.0.3)(esbuild@0.27.3)(less@4.4.2)(terser@5.44.1)(yaml@1.10.2))(webpack@5.105.0) '@storybook/addon-links': specifier: 10.3.5 - version: 10.3.5(react@17.0.2)(storybook@10.3.5(@testing-library/dom@9.3.4)(prettier@3.0.3)(react-dom@17.0.2(react@17.0.2))(react@17.0.2)) + version: 10.3.5(react@17.0.2)(storybook@10.3.5(@testing-library/dom@9.3.4)(prettier@3.8.3)(react-dom@17.0.2(react@17.0.2))(react@17.0.2)) '@storybook/addon-styling-webpack': specifier: ^3.0.2 - version: 3.0.2(storybook@10.3.5(@testing-library/dom@9.3.4)(prettier@3.0.3)(react-dom@17.0.2(react@17.0.2))(react@17.0.2))(webpack@5.105.0) + version: 3.0.2(storybook@10.3.5(@testing-library/dom@9.3.4)(prettier@3.8.3)(react-dom@17.0.2(react@17.0.2))(react@17.0.2))(webpack@5.105.0) '@storybook/addon-webpack5-compiler-swc': specifier: ^4.0.3 - version: 4.0.3(storybook@10.3.5(@testing-library/dom@9.3.4)(prettier@3.0.3)(react-dom@17.0.2(react@17.0.2))(react@17.0.2))(webpack@5.105.0) + version: 4.0.3(storybook@10.3.5(@testing-library/dom@9.3.4)(prettier@3.8.3)(react-dom@17.0.2(react@17.0.2))(react@17.0.2))(webpack@5.105.0) '@storybook/react-webpack5': specifier: 10.3.5 - version: 10.3.5(@swc/core@1.15.11)(esbuild@0.27.3)(react-dom@17.0.2(react@17.0.2))(react@17.0.2)(storybook@10.3.5(@testing-library/dom@9.3.4)(prettier@3.0.3)(react-dom@17.0.2(react@17.0.2))(react@17.0.2))(typescript@6.0.2)(webpack-cli@6.0.1) + version: 10.3.5(@swc/core@1.15.11)(esbuild@0.27.3)(react-dom@17.0.2(react@17.0.2))(react@17.0.2)(storybook@10.3.5(@testing-library/dom@9.3.4)(prettier@3.8.3)(react-dom@17.0.2(react@17.0.2))(react@17.0.2))(typescript@6.0.2)(webpack-cli@6.0.1) '@svgr/webpack': specifier: ^8.1.0 version: 8.1.0 @@ -535,7 +535,7 @@ importers: version: 1.10.0(eslint@9.39.4) eslint-plugin-storybook: specifier: 10.3.5 - version: 10.3.5(eslint@9.39.4)(storybook@10.3.5(@testing-library/dom@9.3.4)(prettier@3.0.3)(react-dom@17.0.2(react@17.0.2))(react@17.0.2))(typescript@6.0.2) + version: 10.3.5(eslint@9.39.4)(storybook@10.3.5(@testing-library/dom@9.3.4)(prettier@3.8.3)(react-dom@17.0.2(react@17.0.2))(react@17.0.2))(typescript@6.0.2) html-loader: specifier: ^5.1.0 version: 5.1.0(webpack@5.105.0) @@ -573,11 +573,11 @@ importers: specifier: ^7.3.3 version: 7.3.3(postcss@8.5.6)(webpack@5.105.0) prettier: - specifier: ^3.0.3 - version: 3.0.3 + specifier: ^3.8.3 + version: 3.8.3 prettier-plugin-tailwindcss: - specifier: ^0.6.14 - version: 0.6.14(prettier@3.0.3) + specifier: ^0.8.0 + version: 0.8.0(prettier@3.8.3) react-docgen-typescript-plugin: specifier: ^1.0.5 version: 1.0.5(typescript@6.0.2)(webpack@5.105.0) @@ -589,7 +589,7 @@ importers: version: 1.5.0(webpack@5.105.0) storybook: specifier: 10.3.5 - version: 10.3.5(@testing-library/dom@9.3.4)(prettier@3.0.3)(react-dom@17.0.2(react@17.0.2))(react@17.0.2) + version: 10.3.5(@testing-library/dom@9.3.4)(prettier@3.8.3)(react-dom@17.0.2(react@17.0.2))(react@17.0.2) storybook-css-modules-preset: specifier: ^1.1.1 version: 1.1.1 @@ -6995,9 +6995,9 @@ packages: resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==} engines: {node: '>= 0.8.0'} - prettier-plugin-tailwindcss@0.6.14: - resolution: {integrity: sha512-pi2e/+ZygeIqntN+vC573BcW5Cve8zUB0SSAGxqpB4f96boZF4M3phPVoOFCeypwkpRYdi7+jQ5YJJUwrkGUAg==} - engines: {node: '>=14.21.3'} + prettier-plugin-tailwindcss@0.8.0: + resolution: {integrity: sha512-V8ITGH87yuBDF6JpEZTOVlUz/saAwqb8f3HRgUj8Lh+tGCcrmorhsLpYqzygwFwK0PE2Ib6Mv3M7T/uE2tZV1g==} + engines: {node: '>=20.19'} peerDependencies: '@ianvs/prettier-plugin-sort-imports': '*' '@prettier/plugin-hermes': '*' @@ -7009,14 +7009,12 @@ packages: prettier: ^3.0 prettier-plugin-astro: '*' prettier-plugin-css-order: '*' - prettier-plugin-import-sort: '*' prettier-plugin-jsdoc: '*' prettier-plugin-marko: '*' prettier-plugin-multiline-arrays: '*' prettier-plugin-organize-attributes: '*' prettier-plugin-organize-imports: '*' prettier-plugin-sort-imports: '*' - prettier-plugin-style-order: '*' prettier-plugin-svelte: '*' peerDependenciesMeta: '@ianvs/prettier-plugin-sort-imports': @@ -7037,8 +7035,6 @@ packages: optional: true prettier-plugin-css-order: optional: true - prettier-plugin-import-sort: - optional: true prettier-plugin-jsdoc: optional: true prettier-plugin-marko: @@ -7051,13 +7047,11 @@ packages: optional: true prettier-plugin-sort-imports: optional: true - prettier-plugin-style-order: - optional: true prettier-plugin-svelte: optional: true - prettier@3.0.3: - resolution: {integrity: sha512-L/4pUDMxcNa8R/EthV08Zt42WBO4h1rarVtK0K+QJG0X187OLo7l699jWw0GKuwzkPQ//jMFA/8Xm6Fh3J/DAg==} + prettier@3.8.3: + resolution: {integrity: sha512-7igPTM53cGHMW8xWuVTydi2KO233VFiTNyF5hLJqpilHfmn8C8gPf+PS7dUT64YcXFbiMGZxS9pCSxL/Dxm/Jw==} engines: {node: '>=14'} hasBin: true @@ -9813,13 +9807,13 @@ snapshots: '@bcoe/v8-coverage@1.0.2': {} - '@chromatic-com/storybook@5.1.2(storybook@10.3.5(@testing-library/dom@9.3.4)(prettier@3.0.3)(react-dom@17.0.2(react@17.0.2))(react@17.0.2))': + '@chromatic-com/storybook@5.1.2(storybook@10.3.5(@testing-library/dom@9.3.4)(prettier@3.8.3)(react-dom@17.0.2(react@17.0.2))(react@17.0.2))': dependencies: '@neoconfetti/react': 1.0.0 chromatic: 13.3.5 filesize: 10.1.6 jsonfile: 6.2.0 - storybook: 10.3.5(@testing-library/dom@9.3.4)(prettier@3.0.3)(react-dom@17.0.2(react@17.0.2))(react@17.0.2) + storybook: 10.3.5(@testing-library/dom@9.3.4)(prettier@3.8.3)(react-dom@17.0.2(react@17.0.2))(react@17.0.2) strip-ansi: 7.1.0 transitivePeerDependencies: - '@chromatic-com/cypress' @@ -10992,15 +10986,15 @@ snapshots: '@standard-schema/spec@1.1.0': {} - '@storybook/addon-docs@10.3.5(@types/react@17.0.75)(esbuild@0.27.3)(rollup@4.54.0)(storybook@10.3.5(@testing-library/dom@9.3.4)(prettier@3.0.3)(react-dom@17.0.2(react@17.0.2))(react@17.0.2))(vite@8.0.8(@types/node@25.0.3)(esbuild@0.27.3)(less@4.4.2)(terser@5.44.1)(yaml@1.10.2))(webpack@5.105.0)': + '@storybook/addon-docs@10.3.5(@types/react@17.0.75)(esbuild@0.27.3)(rollup@4.54.0)(storybook@10.3.5(@testing-library/dom@9.3.4)(prettier@3.8.3)(react-dom@17.0.2(react@17.0.2))(react@17.0.2))(vite@8.0.8(@types/node@25.0.3)(esbuild@0.27.3)(less@4.4.2)(terser@5.44.1)(yaml@1.10.2))(webpack@5.105.0)': dependencies: '@mdx-js/react': 3.1.1(@types/react@17.0.75)(react@17.0.2) - '@storybook/csf-plugin': 10.3.5(esbuild@0.27.3)(rollup@4.54.0)(storybook@10.3.5(@testing-library/dom@9.3.4)(prettier@3.0.3)(react-dom@17.0.2(react@17.0.2))(react@17.0.2))(vite@8.0.8(@types/node@25.0.3)(esbuild@0.27.3)(less@4.4.2)(terser@5.44.1)(yaml@1.10.2))(webpack@5.105.0) + '@storybook/csf-plugin': 10.3.5(esbuild@0.27.3)(rollup@4.54.0)(storybook@10.3.5(@testing-library/dom@9.3.4)(prettier@3.8.3)(react-dom@17.0.2(react@17.0.2))(react@17.0.2))(vite@8.0.8(@types/node@25.0.3)(esbuild@0.27.3)(less@4.4.2)(terser@5.44.1)(yaml@1.10.2))(webpack@5.105.0) '@storybook/icons': 2.0.1(react-dom@17.0.2(react@17.0.2))(react@17.0.2) - '@storybook/react-dom-shim': 10.3.5(react-dom@17.0.2(react@17.0.2))(react@17.0.2)(storybook@10.3.5(@testing-library/dom@9.3.4)(prettier@3.0.3)(react-dom@17.0.2(react@17.0.2))(react@17.0.2)) + '@storybook/react-dom-shim': 10.3.5(react-dom@17.0.2(react@17.0.2))(react@17.0.2)(storybook@10.3.5(@testing-library/dom@9.3.4)(prettier@3.8.3)(react-dom@17.0.2(react@17.0.2))(react@17.0.2)) react: 17.0.2 react-dom: 17.0.2(react@17.0.2) - storybook: 10.3.5(@testing-library/dom@9.3.4)(prettier@3.0.3)(react-dom@17.0.2(react@17.0.2))(react@17.0.2) + storybook: 10.3.5(@testing-library/dom@9.3.4)(prettier@3.8.3)(react-dom@17.0.2(react@17.0.2))(react@17.0.2) ts-dedent: 2.2.0 transitivePeerDependencies: - '@types/react' @@ -11009,30 +11003,30 @@ snapshots: - vite - webpack - '@storybook/addon-links@10.3.5(react@17.0.2)(storybook@10.3.5(@testing-library/dom@9.3.4)(prettier@3.0.3)(react-dom@17.0.2(react@17.0.2))(react@17.0.2))': + '@storybook/addon-links@10.3.5(react@17.0.2)(storybook@10.3.5(@testing-library/dom@9.3.4)(prettier@3.8.3)(react-dom@17.0.2(react@17.0.2))(react@17.0.2))': dependencies: '@storybook/global': 5.0.0 - storybook: 10.3.5(@testing-library/dom@9.3.4)(prettier@3.0.3)(react-dom@17.0.2(react@17.0.2))(react@17.0.2) + storybook: 10.3.5(@testing-library/dom@9.3.4)(prettier@3.8.3)(react-dom@17.0.2(react@17.0.2))(react@17.0.2) optionalDependencies: react: 17.0.2 - '@storybook/addon-styling-webpack@3.0.2(storybook@10.3.5(@testing-library/dom@9.3.4)(prettier@3.0.3)(react-dom@17.0.2(react@17.0.2))(react@17.0.2))(webpack@5.105.0)': + '@storybook/addon-styling-webpack@3.0.2(storybook@10.3.5(@testing-library/dom@9.3.4)(prettier@3.8.3)(react-dom@17.0.2(react@17.0.2))(react@17.0.2))(webpack@5.105.0)': dependencies: - storybook: 10.3.5(@testing-library/dom@9.3.4)(prettier@3.0.3)(react-dom@17.0.2(react@17.0.2))(react@17.0.2) + storybook: 10.3.5(@testing-library/dom@9.3.4)(prettier@3.8.3)(react-dom@17.0.2(react@17.0.2))(react@17.0.2) webpack: 5.105.0(@swc/core@1.15.11)(esbuild@0.27.3)(webpack-cli@6.0.1) - '@storybook/addon-webpack5-compiler-swc@4.0.3(storybook@10.3.5(@testing-library/dom@9.3.4)(prettier@3.0.3)(react-dom@17.0.2(react@17.0.2))(react@17.0.2))(webpack@5.105.0)': + '@storybook/addon-webpack5-compiler-swc@4.0.3(storybook@10.3.5(@testing-library/dom@9.3.4)(prettier@3.8.3)(react-dom@17.0.2(react@17.0.2))(react@17.0.2))(webpack@5.105.0)': dependencies: '@swc/core': 1.15.11 - storybook: 10.3.5(@testing-library/dom@9.3.4)(prettier@3.0.3)(react-dom@17.0.2(react@17.0.2))(react@17.0.2) + storybook: 10.3.5(@testing-library/dom@9.3.4)(prettier@3.8.3)(react-dom@17.0.2(react@17.0.2))(react@17.0.2) swc-loader: 0.2.7(@swc/core@1.15.11)(webpack@5.105.0) transitivePeerDependencies: - '@swc/helpers' - webpack - '@storybook/builder-webpack5@10.3.5(@swc/core@1.15.11)(esbuild@0.27.3)(storybook@10.3.5(@testing-library/dom@9.3.4)(prettier@3.0.3)(react-dom@17.0.2(react@17.0.2))(react@17.0.2))(typescript@6.0.2)(webpack-cli@6.0.1)': + '@storybook/builder-webpack5@10.3.5(@swc/core@1.15.11)(esbuild@0.27.3)(storybook@10.3.5(@testing-library/dom@9.3.4)(prettier@3.8.3)(react-dom@17.0.2(react@17.0.2))(react@17.0.2))(typescript@6.0.2)(webpack-cli@6.0.1)': dependencies: - '@storybook/core-webpack': 10.3.5(storybook@10.3.5(@testing-library/dom@9.3.4)(prettier@3.0.3)(react-dom@17.0.2(react@17.0.2))(react@17.0.2)) + '@storybook/core-webpack': 10.3.5(storybook@10.3.5(@testing-library/dom@9.3.4)(prettier@3.8.3)(react-dom@17.0.2(react@17.0.2))(react@17.0.2)) case-sensitive-paths-webpack-plugin: 2.4.0 cjs-module-lexer: 1.4.3 css-loader: 7.1.4(webpack@5.105.0) @@ -11040,7 +11034,7 @@ snapshots: fork-ts-checker-webpack-plugin: 9.1.0(typescript@6.0.2)(webpack@5.105.0) html-webpack-plugin: 5.5.3(webpack@5.105.0) magic-string: 0.30.21 - storybook: 10.3.5(@testing-library/dom@9.3.4)(prettier@3.0.3)(react-dom@17.0.2(react@17.0.2))(react@17.0.2) + storybook: 10.3.5(@testing-library/dom@9.3.4)(prettier@3.8.3)(react-dom@17.0.2(react@17.0.2))(react@17.0.2) style-loader: 4.0.0(webpack@5.105.0) terser-webpack-plugin: 5.3.16(@swc/core@1.15.11)(esbuild@0.27.3)(webpack@5.105.0) ts-dedent: 2.2.0 @@ -11057,14 +11051,14 @@ snapshots: - uglify-js - webpack-cli - '@storybook/core-webpack@10.3.5(storybook@10.3.5(@testing-library/dom@9.3.4)(prettier@3.0.3)(react-dom@17.0.2(react@17.0.2))(react@17.0.2))': + '@storybook/core-webpack@10.3.5(storybook@10.3.5(@testing-library/dom@9.3.4)(prettier@3.8.3)(react-dom@17.0.2(react@17.0.2))(react@17.0.2))': dependencies: - storybook: 10.3.5(@testing-library/dom@9.3.4)(prettier@3.0.3)(react-dom@17.0.2(react@17.0.2))(react@17.0.2) + storybook: 10.3.5(@testing-library/dom@9.3.4)(prettier@3.8.3)(react-dom@17.0.2(react@17.0.2))(react@17.0.2) ts-dedent: 2.2.0 - '@storybook/csf-plugin@10.3.5(esbuild@0.27.3)(rollup@4.54.0)(storybook@10.3.5(@testing-library/dom@9.3.4)(prettier@3.0.3)(react-dom@17.0.2(react@17.0.2))(react@17.0.2))(vite@8.0.8(@types/node@25.0.3)(esbuild@0.27.3)(less@4.4.2)(terser@5.44.1)(yaml@1.10.2))(webpack@5.105.0)': + '@storybook/csf-plugin@10.3.5(esbuild@0.27.3)(rollup@4.54.0)(storybook@10.3.5(@testing-library/dom@9.3.4)(prettier@3.8.3)(react-dom@17.0.2(react@17.0.2))(react@17.0.2))(vite@8.0.8(@types/node@25.0.3)(esbuild@0.27.3)(less@4.4.2)(terser@5.44.1)(yaml@1.10.2))(webpack@5.105.0)': dependencies: - storybook: 10.3.5(@testing-library/dom@9.3.4)(prettier@3.0.3)(react-dom@17.0.2(react@17.0.2))(react@17.0.2) + storybook: 10.3.5(@testing-library/dom@9.3.4)(prettier@3.8.3)(react-dom@17.0.2(react@17.0.2))(react@17.0.2) unplugin: 2.3.11 optionalDependencies: esbuild: 0.27.3 @@ -11079,9 +11073,9 @@ snapshots: react: 17.0.2 react-dom: 17.0.2(react@17.0.2) - '@storybook/preset-react-webpack@10.3.5(@swc/core@1.15.11)(esbuild@0.27.3)(react-dom@17.0.2(react@17.0.2))(react@17.0.2)(storybook@10.3.5(@testing-library/dom@9.3.4)(prettier@3.0.3)(react-dom@17.0.2(react@17.0.2))(react@17.0.2))(typescript@6.0.2)(webpack-cli@6.0.1)': + '@storybook/preset-react-webpack@10.3.5(@swc/core@1.15.11)(esbuild@0.27.3)(react-dom@17.0.2(react@17.0.2))(react@17.0.2)(storybook@10.3.5(@testing-library/dom@9.3.4)(prettier@3.8.3)(react-dom@17.0.2(react@17.0.2))(react@17.0.2))(typescript@6.0.2)(webpack-cli@6.0.1)': dependencies: - '@storybook/core-webpack': 10.3.5(storybook@10.3.5(@testing-library/dom@9.3.4)(prettier@3.0.3)(react-dom@17.0.2(react@17.0.2))(react@17.0.2)) + '@storybook/core-webpack': 10.3.5(storybook@10.3.5(@testing-library/dom@9.3.4)(prettier@3.8.3)(react-dom@17.0.2(react@17.0.2))(react@17.0.2)) '@storybook/react-docgen-typescript-plugin': 1.0.6--canary.9.0c3f3b7.0(typescript@6.0.2)(webpack@5.105.0) '@types/semver': 7.7.1 magic-string: 0.30.21 @@ -11090,7 +11084,7 @@ snapshots: react-dom: 17.0.2(react@17.0.2) resolve: 1.22.11 semver: 7.7.3 - storybook: 10.3.5(@testing-library/dom@9.3.4)(prettier@3.0.3)(react-dom@17.0.2(react@17.0.2))(react@17.0.2) + storybook: 10.3.5(@testing-library/dom@9.3.4)(prettier@3.8.3)(react-dom@17.0.2(react@17.0.2))(react@17.0.2) tsconfig-paths: 4.2.0 webpack: 5.105.0(@swc/core@1.15.11)(esbuild@0.27.3)(webpack-cli@6.0.1) optionalDependencies: @@ -11116,20 +11110,20 @@ snapshots: transitivePeerDependencies: - supports-color - '@storybook/react-dom-shim@10.3.5(react-dom@17.0.2(react@17.0.2))(react@17.0.2)(storybook@10.3.5(@testing-library/dom@9.3.4)(prettier@3.0.3)(react-dom@17.0.2(react@17.0.2))(react@17.0.2))': + '@storybook/react-dom-shim@10.3.5(react-dom@17.0.2(react@17.0.2))(react@17.0.2)(storybook@10.3.5(@testing-library/dom@9.3.4)(prettier@3.8.3)(react-dom@17.0.2(react@17.0.2))(react@17.0.2))': dependencies: react: 17.0.2 react-dom: 17.0.2(react@17.0.2) - storybook: 10.3.5(@testing-library/dom@9.3.4)(prettier@3.0.3)(react-dom@17.0.2(react@17.0.2))(react@17.0.2) + storybook: 10.3.5(@testing-library/dom@9.3.4)(prettier@3.8.3)(react-dom@17.0.2(react@17.0.2))(react@17.0.2) - '@storybook/react-webpack5@10.3.5(@swc/core@1.15.11)(esbuild@0.27.3)(react-dom@17.0.2(react@17.0.2))(react@17.0.2)(storybook@10.3.5(@testing-library/dom@9.3.4)(prettier@3.0.3)(react-dom@17.0.2(react@17.0.2))(react@17.0.2))(typescript@6.0.2)(webpack-cli@6.0.1)': + '@storybook/react-webpack5@10.3.5(@swc/core@1.15.11)(esbuild@0.27.3)(react-dom@17.0.2(react@17.0.2))(react@17.0.2)(storybook@10.3.5(@testing-library/dom@9.3.4)(prettier@3.8.3)(react-dom@17.0.2(react@17.0.2))(react@17.0.2))(typescript@6.0.2)(webpack-cli@6.0.1)': dependencies: - '@storybook/builder-webpack5': 10.3.5(@swc/core@1.15.11)(esbuild@0.27.3)(storybook@10.3.5(@testing-library/dom@9.3.4)(prettier@3.0.3)(react-dom@17.0.2(react@17.0.2))(react@17.0.2))(typescript@6.0.2)(webpack-cli@6.0.1) - '@storybook/preset-react-webpack': 10.3.5(@swc/core@1.15.11)(esbuild@0.27.3)(react-dom@17.0.2(react@17.0.2))(react@17.0.2)(storybook@10.3.5(@testing-library/dom@9.3.4)(prettier@3.0.3)(react-dom@17.0.2(react@17.0.2))(react@17.0.2))(typescript@6.0.2)(webpack-cli@6.0.1) - '@storybook/react': 10.3.5(react-dom@17.0.2(react@17.0.2))(react@17.0.2)(storybook@10.3.5(@testing-library/dom@9.3.4)(prettier@3.0.3)(react-dom@17.0.2(react@17.0.2))(react@17.0.2))(typescript@6.0.2) + '@storybook/builder-webpack5': 10.3.5(@swc/core@1.15.11)(esbuild@0.27.3)(storybook@10.3.5(@testing-library/dom@9.3.4)(prettier@3.8.3)(react-dom@17.0.2(react@17.0.2))(react@17.0.2))(typescript@6.0.2)(webpack-cli@6.0.1) + '@storybook/preset-react-webpack': 10.3.5(@swc/core@1.15.11)(esbuild@0.27.3)(react-dom@17.0.2(react@17.0.2))(react@17.0.2)(storybook@10.3.5(@testing-library/dom@9.3.4)(prettier@3.8.3)(react-dom@17.0.2(react@17.0.2))(react@17.0.2))(typescript@6.0.2)(webpack-cli@6.0.1) + '@storybook/react': 10.3.5(react-dom@17.0.2(react@17.0.2))(react@17.0.2)(storybook@10.3.5(@testing-library/dom@9.3.4)(prettier@3.8.3)(react-dom@17.0.2(react@17.0.2))(react@17.0.2))(typescript@6.0.2) react: 17.0.2 react-dom: 17.0.2(react@17.0.2) - storybook: 10.3.5(@testing-library/dom@9.3.4)(prettier@3.0.3)(react-dom@17.0.2(react@17.0.2))(react@17.0.2) + storybook: 10.3.5(@testing-library/dom@9.3.4)(prettier@3.8.3)(react-dom@17.0.2(react@17.0.2))(react@17.0.2) optionalDependencies: typescript: 6.0.2 transitivePeerDependencies: @@ -11140,15 +11134,15 @@ snapshots: - uglify-js - webpack-cli - '@storybook/react@10.3.5(react-dom@17.0.2(react@17.0.2))(react@17.0.2)(storybook@10.3.5(@testing-library/dom@9.3.4)(prettier@3.0.3)(react-dom@17.0.2(react@17.0.2))(react@17.0.2))(typescript@6.0.2)': + '@storybook/react@10.3.5(react-dom@17.0.2(react@17.0.2))(react@17.0.2)(storybook@10.3.5(@testing-library/dom@9.3.4)(prettier@3.8.3)(react-dom@17.0.2(react@17.0.2))(react@17.0.2))(typescript@6.0.2)': dependencies: '@storybook/global': 5.0.0 - '@storybook/react-dom-shim': 10.3.5(react-dom@17.0.2(react@17.0.2))(react@17.0.2)(storybook@10.3.5(@testing-library/dom@9.3.4)(prettier@3.0.3)(react-dom@17.0.2(react@17.0.2))(react@17.0.2)) + '@storybook/react-dom-shim': 10.3.5(react-dom@17.0.2(react@17.0.2))(react@17.0.2)(storybook@10.3.5(@testing-library/dom@9.3.4)(prettier@3.8.3)(react-dom@17.0.2(react@17.0.2))(react@17.0.2)) react: 17.0.2 react-docgen: 8.0.3 react-docgen-typescript: 2.2.2(typescript@6.0.2) react-dom: 17.0.2(react@17.0.2) - storybook: 10.3.5(@testing-library/dom@9.3.4)(prettier@3.0.3)(react-dom@17.0.2(react@17.0.2))(react@17.0.2) + storybook: 10.3.5(@testing-library/dom@9.3.4)(prettier@3.8.3)(react-dom@17.0.2(react@17.0.2))(react@17.0.2) optionalDependencies: typescript: 6.0.2 transitivePeerDependencies: @@ -13675,11 +13669,11 @@ snapshots: dependencies: eslint: 9.39.4 - eslint-plugin-storybook@10.3.5(eslint@9.39.4)(storybook@10.3.5(@testing-library/dom@9.3.4)(prettier@3.0.3)(react-dom@17.0.2(react@17.0.2))(react@17.0.2))(typescript@6.0.2): + eslint-plugin-storybook@10.3.5(eslint@9.39.4)(storybook@10.3.5(@testing-library/dom@9.3.4)(prettier@3.8.3)(react-dom@17.0.2(react@17.0.2))(react@17.0.2))(typescript@6.0.2): dependencies: '@typescript-eslint/utils': 8.58.2(eslint@9.39.4)(typescript@6.0.2) eslint: 9.39.4 - storybook: 10.3.5(@testing-library/dom@9.3.4)(prettier@3.0.3)(react-dom@17.0.2(react@17.0.2))(react@17.0.2) + storybook: 10.3.5(@testing-library/dom@9.3.4)(prettier@3.8.3)(react-dom@17.0.2(react@17.0.2))(react@17.0.2) transitivePeerDependencies: - supports-color - typescript @@ -15875,11 +15869,11 @@ snapshots: prelude-ls@1.2.1: {} - prettier-plugin-tailwindcss@0.6.14(prettier@3.0.3): + prettier-plugin-tailwindcss@0.8.0(prettier@3.8.3): dependencies: - prettier: 3.0.3 + prettier: 3.8.3 - prettier@3.0.3: {} + prettier@3.8.3: {} pretty-error@4.0.0: dependencies: @@ -16848,7 +16842,7 @@ snapshots: storybook-css-modules-preset@1.1.1: {} - storybook@10.3.5(@testing-library/dom@9.3.4)(prettier@3.0.3)(react-dom@17.0.2(react@17.0.2))(react@17.0.2): + storybook@10.3.5(@testing-library/dom@9.3.4)(prettier@3.8.3)(react-dom@17.0.2(react@17.0.2))(react@17.0.2): dependencies: '@storybook/global': 5.0.0 '@storybook/icons': 2.0.1(react-dom@17.0.2(react@17.0.2))(react@17.0.2) @@ -16864,7 +16858,7 @@ snapshots: use-sync-external-store: 1.6.0(react@17.0.2) ws: 8.19.0 optionalDependencies: - prettier: 3.0.3 + prettier: 3.8.3 transitivePeerDependencies: - '@testing-library/dom' - bufferutil