From ba7be67e3f16c41c6fae2299db3179edc2407ad6 Mon Sep 17 00:00:00 2001 From: Anton Gilgur <4970083+agilgur5@users.noreply.github.com> Date: Fri, 25 Oct 2024 10:40:17 -0400 Subject: [PATCH] build(ui): automatically sort imports (#13813) Signed-off-by: Anton Gilgur --- ui/.prettierrc | 12 + ui/package.json | 1 + ui/src/app/app-router.tsx | 8 +- ui/src/app/app.tsx | 4 +- .../cluster-workflow-template-details.tsx | 6 +- .../cluster-workflow-template-editor.tsx | 2 +- .../cluster-workflow-template-list.tsx | 6 +- .../cron-workflows/cron-workflow-creator.tsx | 2 +- .../cron-workflows/cron-workflow-details.tsx | 4 +- .../cron-workflows/cron-workflow-editor.tsx | 2 +- .../app/cron-workflows/cron-workflow-list.tsx | 8 +- .../cron-workflow-status-viewer.tsx | 2 +- ui/src/app/event-flow/event-flow-page.tsx | 4 +- .../event-sources/event-source-creator.tsx | 2 +- .../event-sources/event-source-details.tsx | 4 +- .../app/event-sources/event-source-editor.tsx | 2 +- .../app/event-sources/event-source-list.tsx | 6 +- ui/src/app/index.tsx | 3 +- ui/src/app/modals/feedback-modal.tsx | 1 + ui/src/app/plugins/plugin-list.tsx | 2 +- ui/src/app/reports/reports.tsx | 6 +- ui/src/app/sensors/sensor-creator.tsx | 2 +- ui/src/app/sensors/sensor-details.tsx | 4 +- ui/src/app/sensors/sensor-editor.tsx | 2 +- ui/src/app/sensors/sensor-list.tsx | 4 +- ui/src/app/sensors/sensors-container.tsx | 1 + ui/src/app/shared/components/button.tsx | 1 + ui/src/app/shared/components/chat-button.tsx | 1 + .../components/cost-optimisation-nudge.tsx | 1 + .../app/shared/components/error-boundary.tsx | 1 + .../shared/components/graph/pretty-layout.ts | 1 + ui/src/app/shared/components/link-button.tsx | 1 + ui/src/app/shared/components/loading.tsx | 2 +- .../shared/components/namespace-filter.tsx | 1 + ui/src/app/shared/components/nudge.tsx | 1 + ui/src/app/shared/components/number-input.tsx | 1 + .../shared/components/object-parser.test.ts | 2 +- .../shared/components/pagination-panel.tsx | 1 + .../app/shared/components/security-nudge.tsx | 1 + .../app/shared/components/toggle-button.tsx | 1 + .../app/shared/components/upload-button.tsx | 1 + ui/src/app/shared/conditions-panel.tsx | 1 + ui/src/app/shared/context.ts | 2 +- ui/src/app/shared/list-watch.ts | 1 + ui/src/app/shared/pod-name.test.ts | 1 - ui/src/app/shared/resources-duration.tsx | 1 + ui/src/app/shared/retry-watch.ts | 1 + .../shared/services/cron-workflow-service.ts | 2 +- .../shared/services/event-source-service.ts | 1 + ui/src/app/shared/services/info-service.ts | 1 - ui/src/app/shared/services/sensor-service.ts | 1 + .../services/workflow-template-service.ts | 2 +- .../app/shared/services/workflows-service.ts | 5 +- ui/src/app/shared/use-collect-event.ts | 1 + ui/src/app/shared/use-timestamp.ts | 1 + .../workflow-event-bindings.tsx | 4 +- .../workflow-template-creator.tsx | 2 +- .../workflow-template-details.tsx | 8 +- .../workflow-template-editor.tsx | 2 +- .../workflow-template-list.tsx | 6 +- .../app/workflows/components/events-panel.tsx | 1 + .../components/resubmit-workflow-panel.tsx | 2 +- .../components/retry-workflow-node-panel.tsx | 2 +- .../components/retry-workflow-panel.tsx | 2 +- .../components/submit-workflow-panel.tsx | 2 +- .../workflow-creator-info.tsx | 1 + .../workflows/components/workflow-creator.tsx | 2 +- .../workflow-dag-render-options-panel.tsx | 1 + .../workflow-details-list.tsx | 4 +- .../workflow-details/artifact-panel.tsx | 2 +- .../workflow-details/workflow-details.tsx | 4 +- .../workflows/components/workflow-editor.tsx | 2 +- .../workflow-filters/workflow-filters.tsx | 6 +- .../workflows/components/workflow-link.tsx | 1 + .../full-height-logs-viewer.tsx | 3 +- .../json-logs-field-selector.tsx | 1 + .../workflow-logs-viewer.tsx | 6 +- .../workflow-node-info/workflow-node-info.tsx | 1 - .../components/workflow-summary-panel.tsx | 2 +- .../components/workflows-container.tsx | 1 + .../workflows-list/workflows-list.tsx | 7 +- .../workflows-row/workflows-row.tsx | 2 +- ui/yarn.lock | 318 +++++++++--------- 83 files changed, 295 insertions(+), 238 deletions(-) diff --git a/ui/.prettierrc b/ui/.prettierrc index 4b8c765f94c7..941f9dc59017 100644 --- a/ui/.prettierrc +++ b/ui/.prettierrc @@ -1,9 +1,21 @@ { "arrowParens": "avoid", "bracketSpacing": false, + "importOrder": [ + "", + "", + "", + "^[.]", + "", + ".[s?]css$" +], + "importOrderTypeScriptVersion": "4.9.5", "jsxSingleQuote": true, "jsxBracketSameLine": true, "printWidth": 180, + "plugins": [ + "@ianvs/prettier-plugin-sort-imports" + ], "quoteProps": "consistent", "singleQuote": true, "tabWidth": 4, diff --git a/ui/package.json b/ui/package.json index 4e672a23d037..266abef9230c 100644 --- a/ui/package.json +++ b/ui/package.json @@ -44,6 +44,7 @@ "@babel/core": "^7.22.11", "@babel/preset-env": "^7.22.10", "@fortawesome/fontawesome-free": "^6.5.1", + "@ianvs/prettier-plugin-sort-imports": "^4.3.1", "@types/chart.js": "^2.9.24", "@types/classnames": "^2.3.1", "@types/dagre": "^0.7.52", diff --git a/ui/src/app/app-router.tsx b/ui/src/app/app-router.tsx index 1e1db258da62..1c775d6809f0 100644 --- a/ui/src/app/app-router.tsx +++ b/ui/src/app/app-router.tsx @@ -1,13 +1,13 @@ -import * as H from 'history'; import {Layout} from 'argo-ui/src/components/layout/layout'; import {NotificationsManager} from 'argo-ui/src/components/notifications/notification-manager'; import {Notifications, NotificationType} from 'argo-ui/src/components/notifications/notifications'; -import {PopupManager} from 'argo-ui/src/components/popup/popup-manager'; import {Popup, PopupProps} from 'argo-ui/src/components/popup/popup'; - +import {PopupManager} from 'argo-ui/src/components/popup/popup-manager'; +import * as H from 'history'; import * as React from 'react'; import {useEffect, useState} from 'react'; import {Redirect, Route, Router, Switch} from 'react-router'; + import {Version} from '../models'; import apiDocs from './api-docs'; import clusterWorkflowTemplates from './cluster-workflow-templates'; @@ -23,8 +23,8 @@ import sensors from './sensors'; import {uiUrl} from './shared/base'; import {ChatButton} from './shared/components/chat-button'; import ErrorBoundary from './shared/components/error-boundary'; -import {services} from './shared/services'; import * as nsUtils from './shared/namespaces'; +import {services} from './shared/services'; import userinfo from './userinfo'; import {Widgets} from './widgets/widgets'; import workflowEventBindings from './workflow-event-bindings'; diff --git a/ui/src/app/app.tsx b/ui/src/app/app.tsx index 120121ea2cbf..4fb3c0329023 100644 --- a/ui/src/app/app.tsx +++ b/ui/src/app/app.tsx @@ -1,8 +1,8 @@ -import {createBrowserHistory} from 'history'; -import * as React from 'react'; import {NavigationManager} from 'argo-ui/src/components/navigation'; import {NotificationsManager} from 'argo-ui/src/components/notifications/notification-manager'; import {PopupManager} from 'argo-ui/src/components/popup/popup-manager'; +import {createBrowserHistory} from 'history'; +import * as React from 'react'; import 'argo-ui/src/styles/main.scss'; diff --git a/ui/src/app/cluster-workflow-templates/cluster-workflow-template-details.tsx b/ui/src/app/cluster-workflow-templates/cluster-workflow-template-details.tsx index 3523474acfc6..3511d249a13d 100644 --- a/ui/src/app/cluster-workflow-templates/cluster-workflow-template-details.tsx +++ b/ui/src/app/cluster-workflow-templates/cluster-workflow-template-details.tsx @@ -10,16 +10,16 @@ import {ClusterWorkflowTemplate, Workflow} from '../../models'; import {uiUrl} from '../shared/base'; import {ErrorNotice} from '../shared/components/error-notice'; import {Loading} from '../shared/components/loading'; -import {useCollectEvent} from '../shared/use-collect-event'; import {ZeroState} from '../shared/components/zero-state'; import {Context} from '../shared/context'; import {historyUrl} from '../shared/history'; +import * as nsUtils from '../shared/namespaces'; import {services} from '../shared/services'; +import {useCollectEvent} from '../shared/use-collect-event'; import {useEditableObject} from '../shared/use-editable-object'; import {useQueryParams} from '../shared/use-query-params'; -import * as nsUtils from '../shared/namespaces'; -import {WorkflowDetailsList} from '../workflows/components/workflow-details-list/workflow-details-list'; import {SubmitWorkflowPanel} from '../workflows/components/submit-workflow-panel'; +import {WorkflowDetailsList} from '../workflows/components/workflow-details-list/workflow-details-list'; import {ClusterWorkflowTemplateEditor} from './cluster-workflow-template-editor'; import '../workflows/components/workflow-details/workflow-details.scss'; diff --git a/ui/src/app/cluster-workflow-templates/cluster-workflow-template-editor.tsx b/ui/src/app/cluster-workflow-templates/cluster-workflow-template-editor.tsx index 32179230605b..6a6bfd2010b6 100644 --- a/ui/src/app/cluster-workflow-templates/cluster-workflow-template-editor.tsx +++ b/ui/src/app/cluster-workflow-templates/cluster-workflow-template-editor.tsx @@ -1,5 +1,5 @@ -import * as React from 'react'; import {Tabs} from 'argo-ui/src/components/tabs/tabs'; +import * as React from 'react'; import {WorkflowTemplate} from '../../models'; import {LabelsAndAnnotationsEditor} from '../shared/components/editors/labels-and-annotations-editor'; diff --git a/ui/src/app/cluster-workflow-templates/cluster-workflow-template-list.tsx b/ui/src/app/cluster-workflow-templates/cluster-workflow-template-list.tsx index c5cffe6c2f96..ffbc976d2393 100644 --- a/ui/src/app/cluster-workflow-templates/cluster-workflow-template-list.tsx +++ b/ui/src/app/cluster-workflow-templates/cluster-workflow-template-list.tsx @@ -11,16 +11,16 @@ import {ExampleManifests} from '../shared/components/example-manifests'; import {InfoIcon} from '../shared/components/fa-icons'; import {Loading} from '../shared/components/loading'; import {Timestamp, TimestampSwitch} from '../shared/components/timestamp'; -import {useCollectEvent} from '../shared/use-collect-event'; import {ZeroState} from '../shared/components/zero-state'; import {Context} from '../shared/context'; -import {useQueryParams} from '../shared/use-query-params'; import {Footnote} from '../shared/footnote'; import {services} from '../shared/services'; +import {useCollectEvent} from '../shared/use-collect-event'; +import {useQueryParams} from '../shared/use-query-params'; +import useTimestamp, {TIMESTAMP_KEYS} from '../shared/use-timestamp'; import {ClusterWorkflowTemplateCreator} from './cluster-workflow-template-creator'; import './cluster-workflow-template-list.scss'; -import useTimestamp, {TIMESTAMP_KEYS} from '../shared/use-timestamp'; export function ClusterWorkflowTemplateList({history, location}: RouteComponentProps) { const {navigation} = useContext(Context); diff --git a/ui/src/app/cron-workflows/cron-workflow-creator.tsx b/ui/src/app/cron-workflows/cron-workflow-creator.tsx index 773438ac11e4..4494218fc270 100644 --- a/ui/src/app/cron-workflows/cron-workflow-creator.tsx +++ b/ui/src/app/cron-workflows/cron-workflow-creator.tsx @@ -7,8 +7,8 @@ import {ErrorNotice} from '../shared/components/error-notice'; import {ExampleManifests} from '../shared/components/example-manifests'; import {UploadButton} from '../shared/components/upload-button'; import {exampleCronWorkflow} from '../shared/examples'; -import {services} from '../shared/services'; import * as nsUtils from '../shared/namespaces'; +import {services} from '../shared/services'; import {CronWorkflowEditor} from './cron-workflow-editor'; export function CronWorkflowCreator({onCreate, namespace}: {namespace: string; onCreate: (cronWorkflow: CronWorkflow) => void}) { diff --git a/ui/src/app/cron-workflows/cron-workflow-details.tsx b/ui/src/app/cron-workflows/cron-workflow-details.tsx index 3552c902063f..69d4f5a5ab40 100644 --- a/ui/src/app/cron-workflows/cron-workflow-details.tsx +++ b/ui/src/app/cron-workflows/cron-workflow-details.tsx @@ -11,13 +11,13 @@ import {uiUrl} from '../shared/base'; import {ErrorNotice} from '../shared/components/error-notice'; import {openLinkWithKey} from '../shared/components/links'; import {Loading} from '../shared/components/loading'; -import {useCollectEvent} from '../shared/use-collect-event'; import {ZeroState} from '../shared/components/zero-state'; import {Context} from '../shared/context'; import {historyUrl} from '../shared/history'; import {services} from '../shared/services'; -import {useQueryParams} from '../shared/use-query-params'; +import {useCollectEvent} from '../shared/use-collect-event'; import {useEditableObject} from '../shared/use-editable-object'; +import {useQueryParams} from '../shared/use-query-params'; import {WidgetGallery} from '../widgets/widget-gallery'; import {WorkflowDetailsList} from '../workflows/components/workflow-details-list/workflow-details-list'; import {CronWorkflowEditor} from './cron-workflow-editor'; diff --git a/ui/src/app/cron-workflows/cron-workflow-editor.tsx b/ui/src/app/cron-workflows/cron-workflow-editor.tsx index 8f9dca5738e5..a0cf0f38b716 100644 --- a/ui/src/app/cron-workflows/cron-workflow-editor.tsx +++ b/ui/src/app/cron-workflows/cron-workflow-editor.tsx @@ -1,5 +1,5 @@ -import * as React from 'react'; import {Tabs} from 'argo-ui/src/components/tabs/tabs'; +import * as React from 'react'; import {CronWorkflow} from '../../models'; import {LabelsAndAnnotationsEditor} from '../shared/components/editors/labels-and-annotations-editor'; diff --git a/ui/src/app/cron-workflows/cron-workflow-list.tsx b/ui/src/app/cron-workflows/cron-workflow-list.tsx index 2e95f986686d..8bcfefd4f28e 100644 --- a/ui/src/app/cron-workflows/cron-workflow-list.tsx +++ b/ui/src/app/cron-workflows/cron-workflow-list.tsx @@ -6,28 +6,28 @@ import {useContext, useEffect, useState} from 'react'; import {Link, RouteComponentProps} from 'react-router-dom'; import {CronWorkflow, CronWorkflowSpec} from '../../models'; -import {uiUrl} from '../shared/base'; import {ANNOTATION_DESCRIPTION, ANNOTATION_TITLE} from '../shared/annotations'; +import {uiUrl} from '../shared/base'; import {ErrorNotice} from '../shared/components/error-notice'; import {ExampleManifests} from '../shared/components/example-manifests'; import {InfoIcon} from '../shared/components/fa-icons'; import {Loading} from '../shared/components/loading'; import {Timestamp, TimestampSwitch} from '../shared/components/timestamp'; -import {useCollectEvent} from '../shared/use-collect-event'; import {ZeroState} from '../shared/components/zero-state'; import {Context} from '../shared/context'; import {getNextScheduledTime} from '../shared/cron'; import {Footnote} from '../shared/footnote'; import {historyUrl} from '../shared/history'; +import * as nsUtils from '../shared/namespaces'; import {services} from '../shared/services'; +import {useCollectEvent} from '../shared/use-collect-event'; import {useQueryParams} from '../shared/use-query-params'; -import * as nsUtils from '../shared/namespaces'; +import useTimestamp, {TIMESTAMP_KEYS} from '../shared/use-timestamp'; import {CronWorkflowCreator} from './cron-workflow-creator'; import {CronWorkflowFilters} from './cron-workflow-filters'; import {PrettySchedule} from './pretty-schedule'; import './cron-workflow-list.scss'; -import useTimestamp, {TIMESTAMP_KEYS} from '../shared/use-timestamp'; const learnMore = Learn more; diff --git a/ui/src/app/cron-workflows/cron-workflow-status-viewer.tsx b/ui/src/app/cron-workflows/cron-workflow-status-viewer.tsx index 5056e04e99eb..66d04fd0e2b4 100644 --- a/ui/src/app/cron-workflows/cron-workflow-status-viewer.tsx +++ b/ui/src/app/cron-workflows/cron-workflow-status-viewer.tsx @@ -4,9 +4,9 @@ import * as React from 'react'; import {CronWorkflowSpec, CronWorkflowStatus} from '../../models'; import {Timestamp} from '../shared/components/timestamp'; import {ConditionsPanel} from '../shared/conditions-panel'; +import {TIMESTAMP_KEYS} from '../shared/use-timestamp'; import {WorkflowLink} from '../workflows/components/workflow-link'; import {PrettySchedule} from './pretty-schedule'; -import {TIMESTAMP_KEYS} from '../shared/use-timestamp'; export function CronWorkflowStatusViewer({spec, status}: {spec: CronWorkflowSpec; status: CronWorkflowStatus}) { if (status === null) { diff --git a/ui/src/app/event-flow/event-flow-page.tsx b/ui/src/app/event-flow/event-flow-page.tsx index 721f79dfb612..a3be3689e59e 100644 --- a/ui/src/app/event-flow/event-flow-page.tsx +++ b/ui/src/app/event-flow/event-flow-page.tsx @@ -19,16 +19,16 @@ import {Node} from '../shared/components/graph/types'; import {Links} from '../shared/components/links'; import {NamespaceFilter} from '../shared/components/namespace-filter'; import {ResourceEditor} from '../shared/components/resource-editor/resource-editor'; -import {useCollectEvent} from '../shared/use-collect-event'; import {ZeroState} from '../shared/components/zero-state'; import {Context} from '../shared/context'; import {Footnote} from '../shared/footnote'; import {historyUrl} from '../shared/history'; import {ListWatch} from '../shared/list-watch'; +import * as nsUtils from '../shared/namespaces'; import {RetryObservable} from '../shared/retry-observable'; import {services} from '../shared/services'; +import {useCollectEvent} from '../shared/use-collect-event'; import {useQueryParams} from '../shared/use-query-params'; -import * as nsUtils from '../shared/namespaces'; import {EventsPanel} from '../workflows/components/events-panel'; import {FullHeightLogsViewer} from '../workflows/components/workflow-logs-viewer/full-height-logs-viewer'; import {buildGraph} from './build-graph'; diff --git a/ui/src/app/event-sources/event-source-creator.tsx b/ui/src/app/event-sources/event-source-creator.tsx index b226f8e9c8b3..51610fc3acba 100644 --- a/ui/src/app/event-sources/event-source-creator.tsx +++ b/ui/src/app/event-sources/event-source-creator.tsx @@ -6,8 +6,8 @@ import {Button} from '../shared/components/button'; import {ErrorNotice} from '../shared/components/error-notice'; import {UploadButton} from '../shared/components/upload-button'; import {exampleEventSource} from '../shared/examples'; -import {services} from '../shared/services'; import * as nsUtils from '../shared/namespaces'; +import {services} from '../shared/services'; import {EventSourceEditor} from './event-source-editor'; export function EventSourceCreator({onCreate, namespace}: {namespace: string; onCreate: (eventSource: EventSource) => void}) { diff --git a/ui/src/app/event-sources/event-source-details.tsx b/ui/src/app/event-sources/event-source-details.tsx index 42937fccb90d..255e464aba50 100644 --- a/ui/src/app/event-sources/event-source-details.tsx +++ b/ui/src/app/event-sources/event-source-details.tsx @@ -11,12 +11,12 @@ import {ID} from '../event-flow/id'; import {uiUrl} from '../shared/base'; import {ErrorNotice} from '../shared/components/error-notice'; import {Loading} from '../shared/components/loading'; -import {useCollectEvent} from '../shared/use-collect-event'; import {Context} from '../shared/context'; import {historyUrl} from '../shared/history'; import {services} from '../shared/services'; -import {useQueryParams} from '../shared/use-query-params'; +import {useCollectEvent} from '../shared/use-collect-event'; import {useEditableObject} from '../shared/use-editable-object'; +import {useQueryParams} from '../shared/use-query-params'; import {EventsPanel} from '../workflows/components/events-panel'; import {EventSourceEditor} from './event-source-editor'; import {EventSourceLogsViewer} from './event-source-log-viewer'; diff --git a/ui/src/app/event-sources/event-source-editor.tsx b/ui/src/app/event-sources/event-source-editor.tsx index 60bb20227a8d..a02b87a64891 100644 --- a/ui/src/app/event-sources/event-source-editor.tsx +++ b/ui/src/app/event-sources/event-source-editor.tsx @@ -1,5 +1,5 @@ -import * as React from 'react'; import {Tabs} from 'argo-ui/src/components/tabs/tabs'; +import * as React from 'react'; import {EventSource} from '../../models'; import {MetadataEditor} from '../shared/components/editors/metadata-editor'; diff --git a/ui/src/app/event-sources/event-source-list.tsx b/ui/src/app/event-sources/event-source-list.tsx index c9013115d0c2..b7007ef661bc 100644 --- a/ui/src/app/event-sources/event-source-list.tsx +++ b/ui/src/app/event-sources/event-source-list.tsx @@ -15,18 +15,18 @@ import {Node} from '../shared/components/graph/types'; import {Loading} from '../shared/components/loading'; import {NamespaceFilter} from '../shared/components/namespace-filter'; import {Timestamp, TimestampSwitch} from '../shared/components/timestamp'; -import {useCollectEvent} from '../shared/use-collect-event'; import {ZeroState} from '../shared/components/zero-state'; import {Context} from '../shared/context'; import {Footnote} from '../shared/footnote'; import {historyUrl} from '../shared/history'; +import * as nsUtils from '../shared/namespaces'; import {services} from '../shared/services'; +import {useCollectEvent} from '../shared/use-collect-event'; import {useQueryParams} from '../shared/use-query-params'; -import * as nsUtils from '../shared/namespaces'; +import useTimestamp, {TIMESTAMP_KEYS} from '../shared/use-timestamp'; import {EventsPanel} from '../workflows/components/events-panel'; import {EventSourceCreator} from './event-source-creator'; import {EventSourceLogsViewer} from './event-source-log-viewer'; -import useTimestamp, {TIMESTAMP_KEYS} from '../shared/use-timestamp'; const learnMore = Learn more; diff --git a/ui/src/app/index.tsx b/ui/src/app/index.tsx index cdf71fe6049d..72b971a955d7 100644 --- a/ui/src/app/index.tsx +++ b/ui/src/app/index.tsx @@ -1,7 +1,8 @@ import * as React from 'react'; -import {App} from './app'; import {createRoot} from 'react-dom/client'; +import {App} from './app'; + const container = document.getElementById('app'); const root = createRoot(container!); root.render(); diff --git a/ui/src/app/modals/feedback-modal.tsx b/ui/src/app/modals/feedback-modal.tsx index d0844b813e80..68700497e82d 100644 --- a/ui/src/app/modals/feedback-modal.tsx +++ b/ui/src/app/modals/feedback-modal.tsx @@ -1,5 +1,6 @@ import * as React from 'react'; import {useState} from 'react'; + import {BigButton} from '../shared/components/big-button'; import {Modal} from '../shared/components/modal/modal'; import {SurveyButton} from '../shared/components/survey-button'; diff --git a/ui/src/app/plugins/plugin-list.tsx b/ui/src/app/plugins/plugin-list.tsx index 4a65422639c8..c2069143f264 100644 --- a/ui/src/app/plugins/plugin-list.tsx +++ b/ui/src/app/plugins/plugin-list.tsx @@ -4,10 +4,10 @@ import {useEffect, useState} from 'react'; import {RouteComponentProps} from 'react-router-dom'; import {uiUrl} from '../shared/base'; -import {useCollectEvent} from '../shared/use-collect-event'; import {ZeroState} from '../shared/components/zero-state'; import {historyUrl} from '../shared/history'; import * as nsUtils from '../shared/namespaces'; +import {useCollectEvent} from '../shared/use-collect-event'; export function PluginList({match, history}: RouteComponentProps) { // state for URL and query parameters diff --git a/ui/src/app/reports/reports.tsx b/ui/src/app/reports/reports.tsx index b7cd2ca6e5d2..f519a1f3ca20 100644 --- a/ui/src/app/reports/reports.tsx +++ b/ui/src/app/reports/reports.tsx @@ -1,6 +1,8 @@ import {Page} from 'argo-ui/src/components/page/page'; import {ChartOptions} from 'chart.js'; + import 'chartjs-plugin-annotation'; + import * as React from 'react'; import {useContext, useEffect, useState} from 'react'; import {Bar, ChartData} from 'react-chartjs-2'; @@ -9,13 +11,13 @@ import {RouteComponentProps} from 'react-router-dom'; import {uiUrl} from '../shared/base'; import {ErrorNotice} from '../shared/components/error-notice'; import {InfoIcon} from '../shared/components/fa-icons'; -import {useCollectEvent} from '../shared/use-collect-event'; import {ZeroState} from '../shared/components/zero-state'; import {Context} from '../shared/context'; import {Footnote} from '../shared/footnote'; import {historyUrl} from '../shared/history'; -import {services} from '../shared/services'; import * as nsUtils from '../shared/namespaces'; +import {services} from '../shared/services'; +import {useCollectEvent} from '../shared/use-collect-event'; import {ReportFilters} from './reports-filters'; import {workflowsToChartData} from './workflows-to-chart-data'; diff --git a/ui/src/app/sensors/sensor-creator.tsx b/ui/src/app/sensors/sensor-creator.tsx index 57f908955b8a..0236752b7ce8 100644 --- a/ui/src/app/sensors/sensor-creator.tsx +++ b/ui/src/app/sensors/sensor-creator.tsx @@ -6,8 +6,8 @@ import {Button} from '../shared/components/button'; import {ErrorNotice} from '../shared/components/error-notice'; import {UploadButton} from '../shared/components/upload-button'; import {exampleSensor} from '../shared/examples'; -import {services} from '../shared/services'; import * as nsUtils from '../shared/namespaces'; +import {services} from '../shared/services'; import {SensorEditor} from './sensor-editor'; export function SensorCreator({namespace, onCreate}: {namespace: string; onCreate: (sensor: Sensor) => void}) { diff --git a/ui/src/app/sensors/sensor-details.tsx b/ui/src/app/sensors/sensor-details.tsx index c4ddf7b3f00c..5d116f164161 100644 --- a/ui/src/app/sensors/sensor-details.tsx +++ b/ui/src/app/sensors/sensor-details.tsx @@ -10,12 +10,12 @@ import {uiUrl} from '../shared/base'; import {ErrorNotice} from '../shared/components/error-notice'; import {Node} from '../shared/components/graph/types'; import {Loading} from '../shared/components/loading'; -import {useCollectEvent} from '../shared/use-collect-event'; import {Context} from '../shared/context'; import {historyUrl} from '../shared/history'; import {services} from '../shared/services'; -import {useQueryParams} from '../shared/use-query-params'; +import {useCollectEvent} from '../shared/use-collect-event'; import {useEditableObject} from '../shared/use-editable-object'; +import {useQueryParams} from '../shared/use-query-params'; import {SensorEditor} from './sensor-editor'; import {SensorSidePanel} from './sensor-side-panel'; diff --git a/ui/src/app/sensors/sensor-editor.tsx b/ui/src/app/sensors/sensor-editor.tsx index b595af74b02d..83c6180f1679 100644 --- a/ui/src/app/sensors/sensor-editor.tsx +++ b/ui/src/app/sensors/sensor-editor.tsx @@ -1,5 +1,5 @@ -import * as React from 'react'; import {Tabs} from 'argo-ui/src/components/tabs/tabs'; +import * as React from 'react'; import {Sensor} from '../../models'; import {MetadataEditor} from '../shared/components/editors/metadata-editor'; diff --git a/ui/src/app/sensors/sensor-list.tsx b/ui/src/app/sensors/sensor-list.tsx index deb9162a8093..f249294ea68d 100644 --- a/ui/src/app/sensors/sensor-list.tsx +++ b/ui/src/app/sensors/sensor-list.tsx @@ -13,15 +13,15 @@ import {Node} from '../shared/components/graph/types'; import {Loading} from '../shared/components/loading'; import {NamespaceFilter} from '../shared/components/namespace-filter'; import {Timestamp, TimestampSwitch} from '../shared/components/timestamp'; -import {useCollectEvent} from '../shared/use-collect-event'; import {ZeroState} from '../shared/components/zero-state'; import {Context} from '../shared/context'; import {Footnote} from '../shared/footnote'; import {historyUrl} from '../shared/history'; +import * as nsUtils from '../shared/namespaces'; import {services} from '../shared/services'; +import {useCollectEvent} from '../shared/use-collect-event'; import {useQueryParams} from '../shared/use-query-params'; import useTimestamp, {TIMESTAMP_KEYS} from '../shared/use-timestamp'; -import * as nsUtils from '../shared/namespaces'; import {SensorCreator} from './sensor-creator'; import {SensorSidePanel} from './sensor-side-panel'; import {statusIconClasses} from './utils'; diff --git a/ui/src/app/sensors/sensors-container.tsx b/ui/src/app/sensors/sensors-container.tsx index c701615391a5..a68e2f9321fc 100644 --- a/ui/src/app/sensors/sensors-container.tsx +++ b/ui/src/app/sensors/sensors-container.tsx @@ -1,5 +1,6 @@ import * as React from 'react'; import {Route, RouteComponentProps, Switch} from 'react-router'; + import {SensorDetails} from './sensor-details'; import {SensorList} from './sensor-list'; diff --git a/ui/src/app/shared/components/button.tsx b/ui/src/app/shared/components/button.tsx index fb06e763a2fd..8fd17d5881dc 100644 --- a/ui/src/app/shared/components/button.tsx +++ b/ui/src/app/shared/components/button.tsx @@ -1,5 +1,6 @@ import * as React from 'react'; import {MouseEventHandler, ReactNode} from 'react'; + import {Icon} from './icon'; export const Button = ({ diff --git a/ui/src/app/shared/components/chat-button.tsx b/ui/src/app/shared/components/chat-button.tsx index 53a6b976fb14..216eb4401638 100644 --- a/ui/src/app/shared/components/chat-button.tsx +++ b/ui/src/app/shared/components/chat-button.tsx @@ -1,5 +1,6 @@ import * as React from 'react'; import {useEffect, useState} from 'react'; + import {Link} from '../../../models'; import {services} from '../services'; diff --git a/ui/src/app/shared/components/cost-optimisation-nudge.tsx b/ui/src/app/shared/components/cost-optimisation-nudge.tsx index f6466c728f59..d0d54f2564da 100644 --- a/ui/src/app/shared/components/cost-optimisation-nudge.tsx +++ b/ui/src/app/shared/components/cost-optimisation-nudge.tsx @@ -1,5 +1,6 @@ import * as React from 'react'; import {ReactNode} from 'react'; + import {Nudge} from './nudge'; export const CostOptimisationNudge = (props: {name: string; children: ReactNode}) => ( diff --git a/ui/src/app/shared/components/error-boundary.tsx b/ui/src/app/shared/components/error-boundary.tsx index d36124addebd..ff5f461feef0 100644 --- a/ui/src/app/shared/components/error-boundary.tsx +++ b/ui/src/app/shared/components/error-boundary.tsx @@ -1,5 +1,6 @@ import {ErrorInfo} from 'react'; import * as React from 'react'; + import {ErrorPanel} from './error-panel'; interface State { diff --git a/ui/src/app/shared/components/graph/pretty-layout.ts b/ui/src/app/shared/components/graph/pretty-layout.ts index 3aa3681b488c..50124332ba58 100644 --- a/ui/src/app/shared/components/graph/pretty-layout.ts +++ b/ui/src/app/shared/components/graph/pretty-layout.ts @@ -1,4 +1,5 @@ import * as dagre from 'dagre'; + import {Graph, Node} from './types'; const minSize = 1; diff --git a/ui/src/app/shared/components/link-button.tsx b/ui/src/app/shared/components/link-button.tsx index 2d1a72280154..db8dbc5fa179 100644 --- a/ui/src/app/shared/components/link-button.tsx +++ b/ui/src/app/shared/components/link-button.tsx @@ -1,5 +1,6 @@ import * as React from 'react'; import {ReactNode} from 'react'; + import {Button} from './button'; export const LinkButton = ({to, children}: {to: string; children?: ReactNode}) => ( diff --git a/ui/src/app/shared/components/loading.tsx b/ui/src/app/shared/components/loading.tsx index 07745c48e650..183c635a0b1c 100644 --- a/ui/src/app/shared/components/loading.tsx +++ b/ui/src/app/shared/components/loading.tsx @@ -1,5 +1,5 @@ -import * as React from 'react'; import {MockupList} from 'argo-ui/src/components/mockup-list/mockup-list'; +import * as React from 'react'; export const Loading = () => (
diff --git a/ui/src/app/shared/components/namespace-filter.tsx b/ui/src/app/shared/components/namespace-filter.tsx index 2188e8bf57bf..46c94af66ff0 100644 --- a/ui/src/app/shared/components/namespace-filter.tsx +++ b/ui/src/app/shared/components/namespace-filter.tsx @@ -1,4 +1,5 @@ import * as React from 'react'; + import * as nsUtils from '../namespaces'; import {InputFilter} from './input-filter'; diff --git a/ui/src/app/shared/components/nudge.tsx b/ui/src/app/shared/components/nudge.tsx index 9ae47df31314..62c98d7d08c3 100644 --- a/ui/src/app/shared/components/nudge.tsx +++ b/ui/src/app/shared/components/nudge.tsx @@ -1,5 +1,6 @@ import * as React from 'react'; import {useState} from 'react'; + import {Notice} from './notice'; export function Nudge(props: React.PropsWithChildren<{key: string}>) { diff --git a/ui/src/app/shared/components/number-input.tsx b/ui/src/app/shared/components/number-input.tsx index c041c0831f70..8d9992b45a4a 100644 --- a/ui/src/app/shared/components/number-input.tsx +++ b/ui/src/app/shared/components/number-input.tsx @@ -1,4 +1,5 @@ import * as React from 'react'; + import {TextInput} from './text-input'; export const NumberInput = ({onChange, value, placeholder, readOnly}: {value: number; onChange: (value: number) => void; readOnly?: boolean; placeholder?: string}) => diff --git a/ui/src/app/shared/components/object-parser.test.ts b/ui/src/app/shared/components/object-parser.test.ts index e3f868fe47a3..f787f293d5ff 100644 --- a/ui/src/app/shared/components/object-parser.test.ts +++ b/ui/src/app/shared/components/object-parser.test.ts @@ -1,5 +1,5 @@ -import {parse, stringify} from './object-parser'; import {exampleWorkflowTemplate} from '../examples'; +import {parse, stringify} from './object-parser'; describe('parse', () => { it('handles a valid JSON string', () => { diff --git a/ui/src/app/shared/components/pagination-panel.tsx b/ui/src/app/shared/components/pagination-panel.tsx index b7e2e30066b1..411ef77e943a 100644 --- a/ui/src/app/shared/components/pagination-panel.tsx +++ b/ui/src/app/shared/components/pagination-panel.tsx @@ -1,4 +1,5 @@ import * as React from 'react'; + import {Pagination, parseLimit} from '../pagination'; import {WarningIcon} from './fa-icons'; diff --git a/ui/src/app/shared/components/security-nudge.tsx b/ui/src/app/shared/components/security-nudge.tsx index fe069bf0a337..c60c0907c4f6 100644 --- a/ui/src/app/shared/components/security-nudge.tsx +++ b/ui/src/app/shared/components/security-nudge.tsx @@ -1,5 +1,6 @@ import * as React from 'react'; import {ReactNode} from 'react'; + import {Nudge} from './nudge'; export const SecurityNudge = (props: {children: ReactNode}) => ( diff --git a/ui/src/app/shared/components/toggle-button.tsx b/ui/src/app/shared/components/toggle-button.tsx index 9b469217c0d2..a78406e2f727 100644 --- a/ui/src/app/shared/components/toggle-button.tsx +++ b/ui/src/app/shared/components/toggle-button.tsx @@ -1,5 +1,6 @@ import * as React from 'react'; import {ReactNode} from 'react'; + import {Button} from './button'; export const ToggleButton = ({title, children, onToggle, toggled}: {toggled: boolean; onToggle: () => void; children: ReactNode; title?: string}) => ( diff --git a/ui/src/app/shared/components/upload-button.tsx b/ui/src/app/shared/components/upload-button.tsx index 5235fb8e8e56..0cb9f3f3cfe8 100644 --- a/ui/src/app/shared/components/upload-button.tsx +++ b/ui/src/app/shared/components/upload-button.tsx @@ -1,4 +1,5 @@ import * as React from 'react'; + import {parse} from './object-parser'; export function UploadButton(props: {onUpload: (value: T) => void; onError: (error: Error) => void}) { diff --git a/ui/src/app/shared/conditions-panel.tsx b/ui/src/app/shared/conditions-panel.tsx index 12868478cce7..65a356cd6e27 100644 --- a/ui/src/app/shared/conditions-panel.tsx +++ b/ui/src/app/shared/conditions-panel.tsx @@ -1,4 +1,5 @@ import * as React from 'react'; + import {Condition, ConditionType} from '../../models'; import {ErrorIcon, WarningIcon} from './components/fa-icons'; diff --git a/ui/src/app/shared/context.ts b/ui/src/app/shared/context.ts index 45835ba9e2e6..5ea3986aef86 100644 --- a/ui/src/app/shared/context.ts +++ b/ui/src/app/shared/context.ts @@ -1,7 +1,7 @@ -import type {AppContext as ArgoAppContext} from 'argo-ui/src/context'; import type {NavigationApi} from 'argo-ui/src/components/navigation'; import type {NotificationsApi} from 'argo-ui/src/components/notifications/notification-manager'; import type {PopupApi} from 'argo-ui/src/components/popup/popup-manager'; +import type {AppContext as ArgoAppContext} from 'argo-ui/src/context'; import {History} from 'history'; import * as React from 'react'; diff --git a/ui/src/app/shared/list-watch.ts b/ui/src/app/shared/list-watch.ts index 9ccda629c625..7022bec4f485 100644 --- a/ui/src/app/shared/list-watch.ts +++ b/ui/src/app/shared/list-watch.ts @@ -1,5 +1,6 @@ import * as kubernetes from 'argo-ui/src/models/kubernetes'; import {Observable} from 'rxjs'; + import {RetryWatch} from './retry-watch'; interface Resource { diff --git a/ui/src/app/shared/pod-name.test.ts b/ui/src/app/shared/pod-name.test.ts index 1aa72c14d05e..233249605466 100644 --- a/ui/src/app/shared/pod-name.test.ts +++ b/ui/src/app/shared/pod-name.test.ts @@ -1,6 +1,5 @@ import {NodeStatus, Workflow} from '../../models'; import {ANNOTATION_KEY_POD_NAME_VERSION} from './annotations'; - import {createFNVHash, ensurePodNamePrefixLength, getPodName, getTemplateNameFromNode, k8sNamingHashLength, maxK8sResourceNameLength, POD_NAME_V1, POD_NAME_V2} from './pod-name'; describe('pod names', () => { diff --git a/ui/src/app/shared/resources-duration.tsx b/ui/src/app/shared/resources-duration.tsx index 3addaf7adbba..bc434f4411dd 100644 --- a/ui/src/app/shared/resources-duration.tsx +++ b/ui/src/app/shared/resources-duration.tsx @@ -1,4 +1,5 @@ import * as React from 'react'; + import {denominator, formatDuration} from './duration'; interface Props { diff --git a/ui/src/app/shared/retry-watch.ts b/ui/src/app/shared/retry-watch.ts index 4afc8839e86a..e5f53e5e5a23 100644 --- a/ui/src/app/shared/retry-watch.ts +++ b/ui/src/app/shared/retry-watch.ts @@ -1,6 +1,7 @@ import * as kubernetes from 'argo-ui/src/models/kubernetes'; import {WatchEvent} from 'argo-ui/src/models/kubernetes'; import {Observable} from 'rxjs'; + import {RetryObservable} from './retry-observable'; interface Resource { diff --git a/ui/src/app/shared/services/cron-workflow-service.ts b/ui/src/app/shared/services/cron-workflow-service.ts index c7f003ec1a28..f2a959d95196 100644 --- a/ui/src/app/shared/services/cron-workflow-service.ts +++ b/ui/src/app/shared/services/cron-workflow-service.ts @@ -1,6 +1,6 @@ import {CronWorkflow, CronWorkflowList} from '../../../models'; -import {queryParams} from './utils'; import requests from './requests'; +import {queryParams} from './utils'; export const CronWorkflowService = { create(cronWorkflow: CronWorkflow, namespace: string) { diff --git a/ui/src/app/shared/services/event-source-service.ts b/ui/src/app/shared/services/event-source-service.ts index 1c81b26fad2c..76613008dec3 100644 --- a/ui/src/app/shared/services/event-source-service.ts +++ b/ui/src/app/shared/services/event-source-service.ts @@ -1,4 +1,5 @@ import {map} from 'rxjs/operators'; + import {EventSource, EventSourceList, EventSourceWatchEvent, LogEntry} from '../../../models/event-source'; import requests from './requests'; diff --git a/ui/src/app/shared/services/info-service.ts b/ui/src/app/shared/services/info-service.ts index 23137c9401b4..86fc7897c83b 100644 --- a/ui/src/app/shared/services/info-service.ts +++ b/ui/src/app/shared/services/info-service.ts @@ -1,5 +1,4 @@ import {GetUserInfoResponse, Info, Version} from '../../../models'; - import requests from './requests'; let info: Promise; // we cache this globally rather than in localStorage so it is request once per page refresh diff --git a/ui/src/app/shared/services/sensor-service.ts b/ui/src/app/shared/services/sensor-service.ts index 01b59eaf92f4..0803a544ea6c 100644 --- a/ui/src/app/shared/services/sensor-service.ts +++ b/ui/src/app/shared/services/sensor-service.ts @@ -1,4 +1,5 @@ import {map} from 'rxjs/operators'; + import {LogEntry, Sensor, SensorList, SensorWatchEvent} from '../../../models/sensor'; import requests from './requests'; diff --git a/ui/src/app/shared/services/workflow-template-service.ts b/ui/src/app/shared/services/workflow-template-service.ts index 9e5f1e302743..df4c1612fcd3 100644 --- a/ui/src/app/shared/services/workflow-template-service.ts +++ b/ui/src/app/shared/services/workflow-template-service.ts @@ -1,7 +1,7 @@ import * as models from '../../../models'; import {Pagination} from '../pagination'; -import {queryParams} from './utils'; import requests from './requests'; +import {queryParams} from './utils'; export const WorkflowTemplateService = { create(template: models.WorkflowTemplate, namespace: string) { diff --git a/ui/src/app/shared/services/workflows-service.ts b/ui/src/app/shared/services/workflows-service.ts index 71a549edc397..bd35074c497d 100644 --- a/ui/src/app/shared/services/workflows-service.ts +++ b/ui/src/app/shared/services/workflows-service.ts @@ -1,15 +1,16 @@ import {EMPTY, from, Observable, of} from 'rxjs'; import {catchError, filter, map, mergeMap, switchMap} from 'rxjs/operators'; + import * as models from '../../../models'; import {Event, LogEntry, NodeStatus, Workflow, WorkflowList, WorkflowPhase} from '../../../models'; import {ResubmitOpts, RetryOpts} from '../../../models'; import {SubmitOpts} from '../../../models/submit-opts'; +import {NameFilterKeys} from '../../workflows/components/workflow-filters/workflow-filters'; import {uiUrl} from '../base'; import {Pagination} from '../pagination'; -import {queryParams} from './utils'; import requests from './requests'; import {WorkflowDeleteResponse} from './responses'; -import {NameFilterKeys} from '../../workflows/components/workflow-filters/workflow-filters'; +import {queryParams} from './utils'; function isString(value: any): value is string { return typeof value === 'string'; diff --git a/ui/src/app/shared/use-collect-event.ts b/ui/src/app/shared/use-collect-event.ts index c2913cde7720..dc8e86136067 100644 --- a/ui/src/app/shared/use-collect-event.ts +++ b/ui/src/app/shared/use-collect-event.ts @@ -1,4 +1,5 @@ import {useEffect} from 'react'; + import {services} from './services'; export function useCollectEvent(name: string) { diff --git a/ui/src/app/shared/use-timestamp.ts b/ui/src/app/shared/use-timestamp.ts index 53085de8a8c0..96ffd97c954e 100644 --- a/ui/src/app/shared/use-timestamp.ts +++ b/ui/src/app/shared/use-timestamp.ts @@ -1,4 +1,5 @@ import {useState} from 'react'; + import {ScopedLocalStorage} from './scoped-local-storage'; export enum TIMESTAMP_KEYS { diff --git a/ui/src/app/workflow-event-bindings/workflow-event-bindings.tsx b/ui/src/app/workflow-event-bindings/workflow-event-bindings.tsx index 4f23ccd17b34..0444f5714a10 100644 --- a/ui/src/app/workflow-event-bindings/workflow-event-bindings.tsx +++ b/ui/src/app/workflow-event-bindings/workflow-event-bindings.tsx @@ -13,14 +13,14 @@ import {Graph} from '../shared/components/graph/types'; import {Loading} from '../shared/components/loading'; import {NamespaceFilter} from '../shared/components/namespace-filter'; import {ResourceEditor} from '../shared/components/resource-editor/resource-editor'; -import {useCollectEvent} from '../shared/use-collect-event'; import {ZeroState} from '../shared/components/zero-state'; import {Context} from '../shared/context'; import {Footnote} from '../shared/footnote'; import {historyUrl} from '../shared/history'; +import * as nsUtils from '../shared/namespaces'; import {services} from '../shared/services'; +import {useCollectEvent} from '../shared/use-collect-event'; import {useQueryParams} from '../shared/use-query-params'; -import * as nsUtils from '../shared/namespaces'; import {ID} from './id'; const introductionText = ( diff --git a/ui/src/app/workflow-templates/workflow-template-creator.tsx b/ui/src/app/workflow-templates/workflow-template-creator.tsx index e4b3f3ec3e6d..e96f57f8e364 100644 --- a/ui/src/app/workflow-templates/workflow-template-creator.tsx +++ b/ui/src/app/workflow-templates/workflow-template-creator.tsx @@ -7,8 +7,8 @@ import {ErrorNotice} from '../shared/components/error-notice'; import {ExampleManifests} from '../shared/components/example-manifests'; import {UploadButton} from '../shared/components/upload-button'; import {exampleWorkflowTemplate} from '../shared/examples'; -import {services} from '../shared/services'; import * as nsUtils from '../shared/namespaces'; +import {services} from '../shared/services'; import {WorkflowTemplateEditor} from './workflow-template-editor'; export function WorkflowTemplateCreator({namespace, onCreate}: {namespace: string; onCreate: (workflow: WorkflowTemplate) => void}) { diff --git a/ui/src/app/workflow-templates/workflow-template-details.tsx b/ui/src/app/workflow-templates/workflow-template-details.tsx index 43114cf2d031..e5fe532c3a4a 100644 --- a/ui/src/app/workflow-templates/workflow-template-details.tsx +++ b/ui/src/app/workflow-templates/workflow-template-details.tsx @@ -6,20 +6,20 @@ import {useContext, useEffect, useState} from 'react'; import {RouteComponentProps} from 'react-router'; import * as models from '../../models'; -import {WorkflowTemplate, Workflow} from '../../models'; +import {Workflow, WorkflowTemplate} from '../../models'; import {uiUrl} from '../shared/base'; import {ErrorNotice} from '../shared/components/error-notice'; import {Loading} from '../shared/components/loading'; -import {useEditableObject} from '../shared/use-editable-object'; -import {useCollectEvent} from '../shared/use-collect-event'; import {ZeroState} from '../shared/components/zero-state'; import {Context} from '../shared/context'; import {historyUrl} from '../shared/history'; import {services} from '../shared/services'; +import {useCollectEvent} from '../shared/use-collect-event'; +import {useEditableObject} from '../shared/use-editable-object'; import {useQueryParams} from '../shared/use-query-params'; import {WidgetGallery} from '../widgets/widget-gallery'; -import {WorkflowDetailsList} from '../workflows/components/workflow-details-list/workflow-details-list'; import {SubmitWorkflowPanel} from '../workflows/components/submit-workflow-panel'; +import {WorkflowDetailsList} from '../workflows/components/workflow-details-list/workflow-details-list'; import {WorkflowTemplateEditor} from './workflow-template-editor'; export function WorkflowTemplateDetails({history, location, match}: RouteComponentProps) { diff --git a/ui/src/app/workflow-templates/workflow-template-editor.tsx b/ui/src/app/workflow-templates/workflow-template-editor.tsx index c98e92682c7c..d7856a4cca2f 100644 --- a/ui/src/app/workflow-templates/workflow-template-editor.tsx +++ b/ui/src/app/workflow-templates/workflow-template-editor.tsx @@ -1,5 +1,5 @@ -import * as React from 'react'; import {Tabs} from 'argo-ui/src/components/tabs/tabs'; +import * as React from 'react'; import {WorkflowTemplate} from '../../models'; import {LabelsAndAnnotationsEditor} from '../shared/components/editors/labels-and-annotations-editor'; diff --git a/ui/src/app/workflow-templates/workflow-template-list.tsx b/ui/src/app/workflow-templates/workflow-template-list.tsx index 43d416d65eef..74b5e9741e73 100644 --- a/ui/src/app/workflow-templates/workflow-template-list.tsx +++ b/ui/src/app/workflow-templates/workflow-template-list.tsx @@ -13,21 +13,21 @@ import {InfoIcon} from '../shared/components/fa-icons'; import {Loading} from '../shared/components/loading'; import {PaginationPanel} from '../shared/components/pagination-panel'; import {Timestamp, TimestampSwitch} from '../shared/components/timestamp'; -import {useCollectEvent} from '../shared/use-collect-event'; import {ZeroState} from '../shared/components/zero-state'; import {Context} from '../shared/context'; import {Footnote} from '../shared/footnote'; import {historyUrl} from '../shared/history'; +import * as nsUtils from '../shared/namespaces'; import {Pagination, parseLimit} from '../shared/pagination'; import {ScopedLocalStorage} from '../shared/scoped-local-storage'; import {services} from '../shared/services'; +import {useCollectEvent} from '../shared/use-collect-event'; import {useQueryParams} from '../shared/use-query-params'; -import * as nsUtils from '../shared/namespaces'; +import useTimestamp, {TIMESTAMP_KEYS} from '../shared/use-timestamp'; import {WorkflowTemplateCreator} from './workflow-template-creator'; import {WorkflowTemplateFilters} from './workflow-template-filters'; import './workflow-template-list.scss'; -import useTimestamp, {TIMESTAMP_KEYS} from '../shared/use-timestamp'; const learnMore = Learn more; diff --git a/ui/src/app/workflows/components/events-panel.tsx b/ui/src/app/workflows/components/events-panel.tsx index dae92540688b..c41fa9968096 100644 --- a/ui/src/app/workflows/components/events-panel.tsx +++ b/ui/src/app/workflows/components/events-panel.tsx @@ -1,6 +1,7 @@ import * as React from 'react'; import {useEffect, useRef, useState} from 'react'; import {map} from 'rxjs/operators'; + import {Event} from '../../../models'; import {ErrorNotice} from '../../shared/components/error-notice'; import {Notice} from '../../shared/components/notice'; diff --git a/ui/src/app/workflows/components/resubmit-workflow-panel.tsx b/ui/src/app/workflows/components/resubmit-workflow-panel.tsx index 4b18d0ee7224..4cd0a31659dc 100644 --- a/ui/src/app/workflows/components/resubmit-workflow-panel.tsx +++ b/ui/src/app/workflows/components/resubmit-workflow-panel.tsx @@ -2,10 +2,10 @@ import {Checkbox} from 'argo-ui/src/components/checkbox'; import React, {useContext, useState} from 'react'; import {Parameter, ResubmitOpts, Workflow} from '../../../models'; -import {Context} from '../../shared/context'; import {uiUrl} from '../../shared/base'; import {ErrorNotice} from '../../shared/components/error-notice'; import {getValueFromParameter, ParametersInput} from '../../shared/components/parameters-input'; +import {Context} from '../../shared/context'; import {services} from '../../shared/services'; interface Props { diff --git a/ui/src/app/workflows/components/retry-workflow-node-panel.tsx b/ui/src/app/workflows/components/retry-workflow-node-panel.tsx index c48f7ffc9b09..9f67d42d8cd0 100644 --- a/ui/src/app/workflows/components/retry-workflow-node-panel.tsx +++ b/ui/src/app/workflows/components/retry-workflow-node-panel.tsx @@ -3,9 +3,9 @@ import {Tooltip} from 'argo-ui/src/components/tooltip/tooltip'; import React, {useState} from 'react'; import {Parameter, RetryOpts, Workflow} from '../../../models'; +import {ErrorNotice} from '../../shared/components/error-notice'; import {getValueFromParameter, ParametersInput} from '../../shared/components/parameters-input'; import {services} from '../../shared/services'; -import {ErrorNotice} from '../../shared/components/error-notice'; interface Props { nodeId: string; diff --git a/ui/src/app/workflows/components/retry-workflow-panel.tsx b/ui/src/app/workflows/components/retry-workflow-panel.tsx index 01e3794a131f..3525debe3ccd 100644 --- a/ui/src/app/workflows/components/retry-workflow-panel.tsx +++ b/ui/src/app/workflows/components/retry-workflow-panel.tsx @@ -2,10 +2,10 @@ import {Checkbox} from 'argo-ui/src/components/checkbox'; import React, {useContext, useState} from 'react'; import {Parameter, RetryOpts, Workflow} from '../../../models'; -import {Context} from '../../shared/context'; import {uiUrl} from '../../shared/base'; import {ErrorNotice} from '../../shared/components/error-notice'; import {getValueFromParameter, ParametersInput} from '../../shared/components/parameters-input'; +import {Context} from '../../shared/context'; import {services} from '../../shared/services'; interface Props { diff --git a/ui/src/app/workflows/components/submit-workflow-panel.tsx b/ui/src/app/workflows/components/submit-workflow-panel.tsx index 4c905f5f0228..fa5d4abdc089 100644 --- a/ui/src/app/workflows/components/submit-workflow-panel.tsx +++ b/ui/src/app/workflows/components/submit-workflow-panel.tsx @@ -2,11 +2,11 @@ import {Select} from 'argo-ui/src/components/select/select'; import React, {useContext, useMemo, useState} from 'react'; import {Parameter, Template} from '../../../models'; -import {Context} from '../../shared/context'; import {uiUrl} from '../../shared/base'; import {ErrorNotice} from '../../shared/components/error-notice'; import {getValueFromParameter, ParametersInput} from '../../shared/components/parameters-input'; import {TagsInput} from '../../shared/components/tags-input/tags-input'; +import {Context} from '../../shared/context'; import {services} from '../../shared/services'; interface Props { diff --git a/ui/src/app/workflows/components/workflow-creator-info/workflow-creator-info.tsx b/ui/src/app/workflows/components/workflow-creator-info/workflow-creator-info.tsx index 8749e72e8ab6..3d9c3ac9c6c2 100644 --- a/ui/src/app/workflows/components/workflow-creator-info/workflow-creator-info.tsx +++ b/ui/src/app/workflows/components/workflow-creator-info/workflow-creator-info.tsx @@ -1,4 +1,5 @@ import * as React from 'react'; + import * as models from '../../../../models'; import {labels} from '../../../../models'; diff --git a/ui/src/app/workflows/components/workflow-creator.tsx b/ui/src/app/workflows/components/workflow-creator.tsx index efc7ff1d2355..e1b38259e9d0 100644 --- a/ui/src/app/workflows/components/workflow-creator.tsx +++ b/ui/src/app/workflows/components/workflow-creator.tsx @@ -8,8 +8,8 @@ import {ErrorNotice} from '../../shared/components/error-notice'; import {ExampleManifests} from '../../shared/components/example-manifests'; import {UploadButton} from '../../shared/components/upload-button'; import {exampleWorkflow} from '../../shared/examples'; -import {services} from '../../shared/services'; import * as nsUtils from '../../shared/namespaces'; +import {services} from '../../shared/services'; import {SubmitWorkflowPanel} from './submit-workflow-panel'; import {WorkflowEditor} from './workflow-editor'; diff --git a/ui/src/app/workflows/components/workflow-dag/workflow-dag-render-options-panel.tsx b/ui/src/app/workflows/components/workflow-dag/workflow-dag-render-options-panel.tsx index 3be88a123450..f486c04bc2ad 100644 --- a/ui/src/app/workflows/components/workflow-dag/workflow-dag-render-options-panel.tsx +++ b/ui/src/app/workflows/components/workflow-dag/workflow-dag-render-options-panel.tsx @@ -1,4 +1,5 @@ import * as React from 'react'; + import {WorkflowDagRenderOptions} from './workflow-dag'; export function WorkflowDagRenderOptionsPanel(props: WorkflowDagRenderOptions & {onChange: (changed: WorkflowDagRenderOptions) => void}) { diff --git a/ui/src/app/workflows/components/workflow-details-list/workflow-details-list.tsx b/ui/src/app/workflows/components/workflow-details-list/workflow-details-list.tsx index 68f8bef5e90b..ec6775ac958c 100644 --- a/ui/src/app/workflows/components/workflow-details-list/workflow-details-list.tsx +++ b/ui/src/app/workflows/components/workflow-details-list/workflow-details-list.tsx @@ -1,11 +1,11 @@ import * as React from 'react'; import * as models from '../../../../models'; +import {TimestampSwitch} from '../../../shared/components/timestamp'; +import useTimestamp, {TIMESTAMP_KEYS} from '../../../shared/use-timestamp'; import {WorkflowsRow} from '../../../workflows/components/workflows-row/workflows-row'; import './workflow-details-list.scss'; -import useTimestamp, {TIMESTAMP_KEYS} from '../../../shared/use-timestamp'; -import {TimestampSwitch} from '../../../shared/components/timestamp'; interface WorkflowDetailsList { workflows: models.Workflow[]; diff --git a/ui/src/app/workflows/components/workflow-details/artifact-panel.tsx b/ui/src/app/workflows/components/workflow-details/artifact-panel.tsx index ec38bc10f66e..16f9f14b2f62 100644 --- a/ui/src/app/workflows/components/workflow-details/artifact-panel.tsx +++ b/ui/src/app/workflows/components/workflow-details/artifact-panel.tsx @@ -9,9 +9,9 @@ import {FirstTimeUserPanel} from '../../../shared/components/first-time-user-pan import {GiveFeedbackLink} from '../../../shared/components/give-feedback-link'; import {LinkButton} from '../../../shared/components/link-button'; import {SuspenseMonacoEditor} from '../../../shared/components/suspense-monaco-editor'; -import {useCollectEvent} from '../../../shared/use-collect-event'; import {services} from '../../../shared/services'; import requests from '../../../shared/services/requests'; +import {useCollectEvent} from '../../../shared/use-collect-event'; export function ArtifactPanel({ workflow, diff --git a/ui/src/app/workflows/components/workflow-details/workflow-details.tsx b/ui/src/app/workflows/components/workflow-details/workflow-details.tsx index 42dae4ed3ce4..0bf99cba9fe2 100644 --- a/ui/src/app/workflows/components/workflow-details/workflow-details.tsx +++ b/ui/src/app/workflows/components/workflow-details/workflow-details.tsx @@ -13,7 +13,6 @@ import {ErrorNotice} from '../../../shared/components/error-notice'; import {openLinkWithKey, processURL} from '../../../shared/components/links'; import {Loading} from '../../../shared/components/loading'; import {SecurityNudge} from '../../../shared/components/security-nudge'; -import {useCollectEvent} from '../../../shared/use-collect-event'; import {hasArtifactGCError, hasWarningConditionBadge} from '../../../shared/conditions-panel'; import {Context} from '../../../shared/context'; import {historyUrl} from '../../../shared/history'; @@ -21,6 +20,7 @@ import {getPodName} from '../../../shared/pod-name'; import {RetryWatch} from '../../../shared/retry-watch'; import {services} from '../../../shared/services'; import {getResolvedTemplates} from '../../../shared/template-resolution'; +import {useCollectEvent} from '../../../shared/use-collect-event'; import {useQueryParams} from '../../../shared/use-query-params'; import {useResizableWidth} from '../../../shared/use-resizable-width'; import {useTransition} from '../../../shared/use-transition'; @@ -29,6 +29,7 @@ import {WorkflowOperations} from '../../../shared/workflow-operations-map'; import {WidgetGallery} from '../../../widgets/widget-gallery'; import {EventsPanel} from '../events-panel'; import {ResubmitWorkflowPanel} from '../resubmit-workflow-panel'; +import {RetryWorkflowNode} from '../retry-workflow-node-panel'; import {RetryWorkflowPanel} from '../retry-workflow-panel'; import {WorkflowArtifacts} from '../workflow-artifacts'; import {WorkflowLogsViewer} from '../workflow-logs-viewer/workflow-logs-viewer'; @@ -43,7 +44,6 @@ import {SuspendInputs} from './suspend-inputs'; import {WorkflowResourcePanel} from './workflow-resource-panel'; import './workflow-details.scss'; -import {RetryWorkflowNode} from '../retry-workflow-node-panel'; function parseSidePanelParam(param: string) { const [type, nodeId, container] = (param || '').split(':'); diff --git a/ui/src/app/workflows/components/workflow-editor.tsx b/ui/src/app/workflows/components/workflow-editor.tsx index 4c51cb64f596..6dec8cbfad4b 100644 --- a/ui/src/app/workflows/components/workflow-editor.tsx +++ b/ui/src/app/workflows/components/workflow-editor.tsx @@ -1,5 +1,5 @@ -import * as React from 'react'; import {Tabs} from 'argo-ui/src/components/tabs/tabs'; +import * as React from 'react'; import {Workflow} from '../../../models'; import {MetadataEditor} from '../../shared/components/editors/metadata-editor'; diff --git a/ui/src/app/workflows/components/workflow-filters/workflow-filters.tsx b/ui/src/app/workflows/components/workflow-filters/workflow-filters.tsx index 58c865f6fc36..9330ed664c13 100644 --- a/ui/src/app/workflows/components/workflow-filters/workflow-filters.tsx +++ b/ui/src/app/workflows/components/workflow-filters/workflow-filters.tsx @@ -1,7 +1,7 @@ +import classNames from 'classnames'; import * as React from 'react'; import {useMemo} from 'react'; import DatePicker from 'react-datepicker'; -import classNames from 'classnames'; import 'react-datepicker/dist/react-datepicker.css'; @@ -9,11 +9,11 @@ import * as models from '../../../../models'; import {WorkflowPhase} from '../../../../models'; import {CheckboxFilter} from '../../../shared/components/checkbox-filter/checkbox-filter'; import {DataLoaderDropdown} from '../../../shared/components/data-loader-dropdown'; +import {DropDown} from '../../../shared/components/dropdown/dropdown'; +import {InputFilter} from '../../../shared/components/input-filter'; import {NamespaceFilter} from '../../../shared/components/namespace-filter'; import {TagsInput} from '../../../shared/components/tags-input/tags-input'; import {services} from '../../../shared/services'; -import {InputFilter} from '../../../shared/components/input-filter'; -import {DropDown} from '../../../shared/components/dropdown/dropdown'; import './workflow-filters.scss'; diff --git a/ui/src/app/workflows/components/workflow-link.tsx b/ui/src/app/workflows/components/workflow-link.tsx index fa134592033d..7968e51ccd30 100644 --- a/ui/src/app/workflows/components/workflow-link.tsx +++ b/ui/src/app/workflows/components/workflow-link.tsx @@ -1,4 +1,5 @@ import * as React from 'react'; + import {uiUrl} from '../../shared/base'; import {LinkButton} from '../../shared/components/link-button'; diff --git a/ui/src/app/workflows/components/workflow-logs-viewer/full-height-logs-viewer.tsx b/ui/src/app/workflows/components/workflow-logs-viewer/full-height-logs-viewer.tsx index fdac5a2d36ab..4762450fe3ce 100644 --- a/ui/src/app/workflows/components/workflow-logs-viewer/full-height-logs-viewer.tsx +++ b/ui/src/app/workflows/components/workflow-logs-viewer/full-height-logs-viewer.tsx @@ -1,8 +1,7 @@ +import type {LogsViewerProps} from 'argo-ui/src/components/logs-viewer/logs-viewer'; import * as React from 'react'; import {useEffect, useRef, useState} from 'react'; -import type {LogsViewerProps} from 'argo-ui/src/components/logs-viewer/logs-viewer'; - import {Loading} from '../../../shared/components/loading'; import './workflow-logs-viewer.scss'; diff --git a/ui/src/app/workflows/components/workflow-logs-viewer/json-logs-field-selector.tsx b/ui/src/app/workflows/components/workflow-logs-viewer/json-logs-field-selector.tsx index 2785a7ff4c77..4a1c6c6a8b53 100644 --- a/ui/src/app/workflows/components/workflow-logs-viewer/json-logs-field-selector.tsx +++ b/ui/src/app/workflows/components/workflow-logs-viewer/json-logs-field-selector.tsx @@ -1,5 +1,6 @@ import * as React from 'react'; import {useState} from 'react'; + import {TextInput} from '../../../shared/components/text-input'; export interface SelectedJsonFields { diff --git a/ui/src/app/workflows/components/workflow-logs-viewer/workflow-logs-viewer.tsx b/ui/src/app/workflows/components/workflow-logs-viewer/workflow-logs-viewer.tsx index 7f558e93d583..bea447978433 100644 --- a/ui/src/app/workflows/components/workflow-logs-viewer/workflow-logs-viewer.tsx +++ b/ui/src/app/workflows/components/workflow-logs-viewer/workflow-logs-viewer.tsx @@ -1,21 +1,21 @@ +import {Autocomplete} from 'argo-ui/src/components/autocomplete/autocomplete'; import * as React from 'react'; import {useContext, useEffect, useState} from 'react'; -import {Autocomplete} from 'argo-ui/src/components/autocomplete/autocomplete'; import {Observable} from 'rxjs'; import {map, publishReplay, refCount} from 'rxjs/operators'; import * as models from '../../../../models'; import {execSpec} from '../../../../models'; -import debounce from '../../../shared/debounce'; import {Button} from '../../../shared/components/button'; import {ErrorNotice} from '../../../shared/components/error-notice'; import {InfoIcon, WarningIcon} from '../../../shared/components/fa-icons'; import {Links} from '../../../shared/components/links'; import {Context} from '../../../shared/context'; -import {useLocalStorage} from '../../../shared/use-local-storage'; +import debounce from '../../../shared/debounce'; import {getPodName, getTemplateNameFromNode} from '../../../shared/pod-name'; import {ScopedLocalStorage} from '../../../shared/scoped-local-storage'; import {services} from '../../../shared/services'; +import {useLocalStorage} from '../../../shared/use-local-storage'; import {FullHeightLogsViewer} from './full-height-logs-viewer'; import {extractJsonValue, JsonLogsFieldSelector, SelectedJsonFields} from './json-logs-field-selector'; diff --git a/ui/src/app/workflows/components/workflow-node-info/workflow-node-info.tsx b/ui/src/app/workflows/components/workflow-node-info/workflow-node-info.tsx index 874f219b31ef..be90ee6425ab 100644 --- a/ui/src/app/workflows/components/workflow-node-info/workflow-node-info.tsx +++ b/ui/src/app/workflows/components/workflow-node-info/workflow-node-info.tsx @@ -1,7 +1,6 @@ import {Tabs} from 'argo-ui/src/components/tabs/tabs'; import {Ticker} from 'argo-ui/src/components/ticker'; import {Tooltip} from 'argo-ui/src/components/tooltip/tooltip'; - import moment from 'moment'; import * as React from 'react'; import {useState} from 'react'; diff --git a/ui/src/app/workflows/components/workflow-summary-panel.tsx b/ui/src/app/workflows/components/workflow-summary-panel.tsx index 85d66735b7b7..de1ce69347d8 100644 --- a/ui/src/app/workflows/components/workflow-summary-panel.tsx +++ b/ui/src/app/workflows/components/workflow-summary-panel.tsx @@ -10,10 +10,10 @@ import {ConditionsPanel} from '../../shared/conditions-panel'; import {Consumer} from '../../shared/context'; import {wfDuration} from '../../shared/duration'; import {ResourcesDuration} from '../../shared/resources-duration'; +import {TIMESTAMP_KEYS} from '../../shared/use-timestamp'; import {WorkflowCreatorInfo} from './workflow-creator-info/workflow-creator-info'; import {WorkflowFrom} from './workflow-from'; import {WorkflowLabels} from './workflow-labels/workflow-labels'; -import {TIMESTAMP_KEYS} from '../../shared/use-timestamp'; export const WorkflowSummaryPanel = (props: {workflow: Workflow}) => ( diff --git a/ui/src/app/workflows/components/workflows-container.tsx b/ui/src/app/workflows/components/workflows-container.tsx index e0fbf342c88f..f924e3375eb4 100644 --- a/ui/src/app/workflows/components/workflows-container.tsx +++ b/ui/src/app/workflows/components/workflows-container.tsx @@ -1,5 +1,6 @@ import * as React from 'react'; import {Route, RouteComponentProps, Switch} from 'react-router'; + import {WorkflowDetails} from './workflow-details/workflow-details'; import {WorkflowsList} from './workflows-list/workflows-list'; diff --git a/ui/src/app/workflows/components/workflows-list/workflows-list.tsx b/ui/src/app/workflows/components/workflows-list/workflows-list.tsx index 8a5241e48339..4493f1b53ccf 100644 --- a/ui/src/app/workflows/components/workflows-list/workflows-list.tsx +++ b/ui/src/app/workflows/components/workflows-list/workflows-list.tsx @@ -12,6 +12,7 @@ import {ErrorNotice} from '../../../shared/components/error-notice'; import {ExampleManifests} from '../../../shared/components/example-manifests'; import {Loading} from '../../../shared/components/loading'; import {PaginationPanel} from '../../../shared/components/pagination-panel'; +import {TimestampSwitch} from '../../../shared/components/timestamp'; import {ZeroState} from '../../../shared/components/zero-state'; import {Context} from '../../../shared/context'; import {historyUrl} from '../../../shared/history'; @@ -21,16 +22,14 @@ import {Pagination, parseLimit} from '../../../shared/pagination'; import {ScopedLocalStorage} from '../../../shared/scoped-local-storage'; import {services} from '../../../shared/services'; import {useCollectEvent} from '../../../shared/use-collect-event'; +import useTimestamp, {TIMESTAMP_KEYS} from '../../../shared/use-timestamp'; import * as Actions from '../../../shared/workflow-operations-map'; import {WorkflowCreator} from '../workflow-creator'; -import type {NameFilterKeys} from '../workflow-filters/workflow-filters'; -import {NAME_FILTER_KEYS, WorkflowFilters} from '../workflow-filters/workflow-filters'; +import {NAME_FILTER_KEYS, WorkflowFilters, type NameFilterKeys} from '../workflow-filters/workflow-filters'; import {WorkflowsRow} from '../workflows-row/workflows-row'; import {WorkflowsSummaryContainer} from '../workflows-summary-container/workflows-summary-container'; import {WorkflowsToolbar} from '../workflows-toolbar/workflows-toolbar'; -import {TimestampSwitch} from '../../../shared/components/timestamp'; -import useTimestamp, {TIMESTAMP_KEYS} from '../../../shared/use-timestamp'; import './workflows-list.scss'; interface WorkflowListRenderOptions { diff --git a/ui/src/app/workflows/components/workflows-row/workflows-row.tsx b/ui/src/app/workflows/components/workflows-row/workflows-row.tsx index 8e29fd2bc56f..384ac719f91d 100644 --- a/ui/src/app/workflows/components/workflows-row/workflows-row.tsx +++ b/ui/src/app/workflows/components/workflows-row/workflows-row.tsx @@ -7,8 +7,8 @@ import * as models from '../../../../models'; import {isArchivedWorkflow, Workflow} from '../../../../models'; import {ANNOTATION_DESCRIPTION, ANNOTATION_TITLE} from '../../../shared/annotations'; import {uiUrl} from '../../../shared/base'; -import {Loading} from '../../../shared/components/loading'; import {DurationPanel} from '../../../shared/components/duration-panel'; +import {Loading} from '../../../shared/components/loading'; import {PhaseIcon} from '../../../shared/components/phase-icon'; import {Timestamp} from '../../../shared/components/timestamp'; import {wfDuration} from '../../../shared/duration'; diff --git a/ui/yarn.lock b/ui/yarn.lock index ccb924f66403..9795e958a805 100644 --- a/ui/yarn.lock +++ b/ui/yarn.lock @@ -15,49 +15,49 @@ "@jridgewell/gen-mapping" "^0.3.0" "@jridgewell/trace-mapping" "^0.3.9" -"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.22.13", "@babel/code-frame@^7.23.5": - version "7.23.5" - resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.23.5.tgz#9009b69a8c602293476ad598ff53e4562e15c244" - integrity sha512-CgH3s1a96LipHCmSUmYFPwY7MNx8C3avkq7i4Wl3cfa662ldtUe4VM1TPXX70pfmrlWTb6jLqTYrZyT2ZTJBgA== +"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.22.13", "@babel/code-frame@^7.23.5", "@babel/code-frame@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.25.9.tgz#895b6c7e04a7271a0cbfd575d2e8131751914cc7" + integrity sha512-z88xeGxnzehn2sqZ8UdGQEvYErF1odv2CftxInpSYJt6uHuPe9YjahKZITGs3l5LeI9d2ROG+obuDAoSlqbNfQ== dependencies: - "@babel/highlight" "^7.23.4" - chalk "^2.4.2" + "@babel/highlight" "^7.25.9" + picocolors "^1.0.0" -"@babel/compat-data@^7.22.6", "@babel/compat-data@^7.23.3", "@babel/compat-data@^7.23.5": - version "7.23.5" - resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.23.5.tgz#ffb878728bb6bdcb6f4510aa51b1be9afb8cfd98" - integrity sha512-uU27kfDRlhfKl+w1U6vp16IuvSLtjAxdArVXPa9BvLkrr7CYIsxH5adpHObeAGY/41+syctUWOZ140a2Rvkgjw== +"@babel/compat-data@^7.22.6", "@babel/compat-data@^7.23.3", "@babel/compat-data@^7.23.5", "@babel/compat-data@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.25.9.tgz#24b01c5db6a3ebf85661b4fb4a946a9bccc72ac8" + integrity sha512-yD+hEuJ/+wAJ4Ox2/rpNv5HIuPG82x3ZlQvYVn8iYCprdxzE7P1udpGF1jyjQVBU4dgznN+k2h103vxZ7NdPyw== -"@babel/core@^7.1.0", "@babel/core@^7.11.6", "@babel/core@^7.12.3", "@babel/core@^7.22.11", "@babel/core@^7.7.5": - version "7.23.6" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.23.6.tgz#8be77cd77c55baadcc1eae1c33df90ab6d2151d4" - integrity sha512-FxpRyGjrMJXh7X3wGLGhNDCRiwpWEF74sKjTLDJSG5Kyvow3QZaG0Adbqzi9ZrVjTWpsX+2cxWXD71NMg93kdw== +"@babel/core@^7.1.0", "@babel/core@^7.11.6", "@babel/core@^7.12.3", "@babel/core@^7.22.11", "@babel/core@^7.24.0", "@babel/core@^7.7.5": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.25.9.tgz#855a4cddcec4158f3f7afadacdab2a7de8af7434" + integrity sha512-WYvQviPw+Qyib0v92AwNIrdLISTp7RfDkM7bPqBvpbnhY4wq8HvHBZREVdYDXk98C8BkOIVnHAY3yvj7AVISxQ== dependencies: "@ampproject/remapping" "^2.2.0" - "@babel/code-frame" "^7.23.5" - "@babel/generator" "^7.23.6" - "@babel/helper-compilation-targets" "^7.23.6" - "@babel/helper-module-transforms" "^7.23.3" - "@babel/helpers" "^7.23.6" - "@babel/parser" "^7.23.6" - "@babel/template" "^7.22.15" - "@babel/traverse" "^7.23.6" - "@babel/types" "^7.23.6" + "@babel/code-frame" "^7.25.9" + "@babel/generator" "^7.25.9" + "@babel/helper-compilation-targets" "^7.25.9" + "@babel/helper-module-transforms" "^7.25.9" + "@babel/helpers" "^7.25.9" + "@babel/parser" "^7.25.9" + "@babel/template" "^7.25.9" + "@babel/traverse" "^7.25.9" + "@babel/types" "^7.25.9" convert-source-map "^2.0.0" debug "^4.1.0" gensync "^1.0.0-beta.2" json5 "^2.2.3" semver "^6.3.1" -"@babel/generator@^7.23.6": - version "7.23.6" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.23.6.tgz#9e1fca4811c77a10580d17d26b57b036133f3c2e" - integrity sha512-qrSfCYxYQB5owCmGLbl8XRpX1ytXlpueOb0N0UmQwA073KZxejgQTzAmJezxvpwQD9uGtK2shHdi55QT+MbjIw== +"@babel/generator@^7.23.6", "@babel/generator@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.25.9.tgz#c7e828ebe0c2baba103b712924699c9e8a6e32f0" + integrity sha512-omlUGkr5EaoIJrhLf9CJ0TvjBRpd9+AXRG//0GEQ9THSo8wPiTlbpy1/Ow8ZTrbXpjd9FHXfbFQx32I04ht0FA== dependencies: - "@babel/types" "^7.23.6" - "@jridgewell/gen-mapping" "^0.3.2" - "@jridgewell/trace-mapping" "^0.3.17" - jsesc "^2.5.1" + "@babel/types" "^7.25.9" + "@jridgewell/gen-mapping" "^0.3.5" + "@jridgewell/trace-mapping" "^0.3.25" + jsesc "^3.0.2" "@babel/helper-annotate-as-pure@^7.22.5": version "7.22.5" @@ -73,14 +73,14 @@ dependencies: "@babel/types" "^7.22.15" -"@babel/helper-compilation-targets@^7.22.15", "@babel/helper-compilation-targets@^7.22.6", "@babel/helper-compilation-targets@^7.23.6": - version "7.23.6" - resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.23.6.tgz#4d79069b16cbcf1461289eccfbbd81501ae39991" - integrity sha512-9JB548GZoQVmzrFgp8o7KxdgkTGm6xs9DW0o/Pim72UDjzr5ObUQ6ZzYPqA+g9OTS2bBQoctLJrky0RDCAWRgQ== +"@babel/helper-compilation-targets@^7.22.15", "@babel/helper-compilation-targets@^7.22.6", "@babel/helper-compilation-targets@^7.23.6", "@babel/helper-compilation-targets@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.25.9.tgz#55af025ce365be3cdc0c1c1e56c6af617ce88875" + integrity sha512-j9Db8Suy6yV/VHa4qzrj9yZfZxhLWQdVnRlXxmKLYlhWUVB1sB2G5sxuWYXk/whHD9iW76PmNzxZ4UCnTQTVEQ== dependencies: - "@babel/compat-data" "^7.23.5" - "@babel/helper-validator-option" "^7.23.5" - browserslist "^4.22.2" + "@babel/compat-data" "^7.25.9" + "@babel/helper-validator-option" "^7.25.9" + browserslist "^4.24.0" lru-cache "^5.1.1" semver "^6.3.1" @@ -146,23 +146,23 @@ dependencies: "@babel/types" "^7.23.0" -"@babel/helper-module-imports@^7.22.15": - version "7.22.15" - resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.22.15.tgz#16146307acdc40cc00c3b2c647713076464bdbf0" - integrity sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w== +"@babel/helper-module-imports@^7.22.15", "@babel/helper-module-imports@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.25.9.tgz#e7f8d20602ebdbf9ebbea0a0751fb0f2a4141715" + integrity sha512-tnUA4RsrmflIM6W6RFTLFSXITtl0wKjgpnLgXyowocVPrbYrLUXSBXDgTs8BlbmIzIdlBySRQjINYs2BAkiLtw== dependencies: - "@babel/types" "^7.22.15" + "@babel/traverse" "^7.25.9" + "@babel/types" "^7.25.9" -"@babel/helper-module-transforms@^7.23.3": - version "7.23.3" - resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.23.3.tgz#d7d12c3c5d30af5b3c0fcab2a6d5217773e2d0f1" - integrity sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ== +"@babel/helper-module-transforms@^7.23.3", "@babel/helper-module-transforms@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.25.9.tgz#12e4fb2969197ef6d78ea8a2f24375ce85b425fb" + integrity sha512-TvLZY/F3+GvdRYFZFyxMvnsKi+4oJdgZzU3BoGN9Uc2d9C6zfNwJcKKhjqLAhK8i46mv93jsO74fDh3ih6rpHA== dependencies: - "@babel/helper-environment-visitor" "^7.22.20" - "@babel/helper-module-imports" "^7.22.15" - "@babel/helper-simple-access" "^7.22.5" - "@babel/helper-split-export-declaration" "^7.22.6" - "@babel/helper-validator-identifier" "^7.22.20" + "@babel/helper-module-imports" "^7.25.9" + "@babel/helper-simple-access" "^7.25.9" + "@babel/helper-validator-identifier" "^7.25.9" + "@babel/traverse" "^7.25.9" "@babel/helper-optimise-call-expression@^7.22.5": version "7.22.5" @@ -194,12 +194,13 @@ "@babel/helper-member-expression-to-functions" "^7.22.15" "@babel/helper-optimise-call-expression" "^7.22.5" -"@babel/helper-simple-access@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz#4938357dc7d782b80ed6dbb03a0fba3d22b1d5de" - integrity sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w== +"@babel/helper-simple-access@^7.22.5", "@babel/helper-simple-access@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.25.9.tgz#6d51783299884a2c74618d6ef0f86820ec2e7739" + integrity sha512-c6WHXuiaRsJTyHYLJV75t9IqsmTbItYfdj99PnzYGQZkYKvan5/2jKJ7gu31J3/BJ/A18grImSPModuyG/Eo0Q== dependencies: - "@babel/types" "^7.22.5" + "@babel/traverse" "^7.25.9" + "@babel/types" "^7.25.9" "@babel/helper-skip-transparent-expression-wrappers@^7.22.5": version "7.22.5" @@ -215,20 +216,20 @@ dependencies: "@babel/types" "^7.22.5" -"@babel/helper-string-parser@^7.23.4": - version "7.23.4" - resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.23.4.tgz#9478c707febcbbe1ddb38a3d91a2e054ae622d83" - integrity sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ== +"@babel/helper-string-parser@^7.23.4", "@babel/helper-string-parser@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz#1aabb72ee72ed35789b4bbcad3ca2862ce614e8c" + integrity sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA== -"@babel/helper-validator-identifier@^7.22.20": - version "7.22.20" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz#c4ae002c61d2879e724581d96665583dbc1dc0e0" - integrity sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A== +"@babel/helper-validator-identifier@^7.22.20", "@babel/helper-validator-identifier@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz#24b64e2c3ec7cd3b3c547729b8d16871f22cbdc7" + integrity sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ== -"@babel/helper-validator-option@^7.23.5": - version "7.23.5" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.23.5.tgz#907a3fbd4523426285365d1206c423c4c5520307" - integrity sha512-85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw== +"@babel/helper-validator-option@^7.23.5", "@babel/helper-validator-option@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.25.9.tgz#86e45bd8a49ab7e03f276577f96179653d41da72" + integrity sha512-e/zv1co8pp55dNdEcCynfj9X7nyUKUXoUEwfXqaZt0omVOmDe9oOTdKStH4GmAw6zxMFs50ZayuMfHDKlO7Tfw== "@babel/helper-wrap-function@^7.22.20": version "7.22.20" @@ -239,28 +240,30 @@ "@babel/template" "^7.22.15" "@babel/types" "^7.22.19" -"@babel/helpers@^7.23.6": - version "7.23.6" - resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.23.6.tgz#d03af2ee5fb34691eec0cda90f5ecbb4d4da145a" - integrity sha512-wCfsbN4nBidDRhpDhvcKlzHWCTlgJYUUdSJfzXb2NuBssDSIjc3xcb+znA7l+zYsFljAcGM0aFkN40cR3lXiGA== +"@babel/helpers@^7.23.6", "@babel/helpers@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.25.9.tgz#9e26aa6fbefdbca4f8c8a1d66dc6f1c00ddadb0a" + integrity sha512-oKWp3+usOJSzDZOucZUAMayhPz/xVjzymyDzUN8dk0Wd3RWMlGLXi07UCQ/CgQVb8LvXx3XBajJH4XGgkt7H7g== dependencies: - "@babel/template" "^7.22.15" - "@babel/traverse" "^7.23.6" - "@babel/types" "^7.23.6" + "@babel/template" "^7.25.9" + "@babel/types" "^7.25.9" -"@babel/highlight@^7.23.4": - version "7.23.4" - resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.23.4.tgz#edaadf4d8232e1a961432db785091207ead0621b" - integrity sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A== +"@babel/highlight@^7.23.4", "@babel/highlight@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.25.9.tgz#8141ce68fc73757946f983b343f1231f4691acc6" + integrity sha512-llL88JShoCsth8fF8R4SJnIn+WLvR6ccFxu1H3FlMhDontdcmZWf2HgIZ7AIqV3Xcck1idlohrN4EUBQz6klbw== dependencies: - "@babel/helper-validator-identifier" "^7.22.20" + "@babel/helper-validator-identifier" "^7.25.9" chalk "^2.4.2" js-tokens "^4.0.0" + picocolors "^1.0.0" -"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.20.7", "@babel/parser@^7.22.15", "@babel/parser@^7.23.6": - version "7.23.6" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.23.6.tgz#ba1c9e512bda72a47e285ae42aff9d2a635a9e3b" - integrity sha512-Z2uID7YJ7oNvAI20O9X0bblw7Qqs8Q2hFy0R9tAfnfLkp5MW0UH9eUvnDSnFwKZ0AvgS1ucqR4KzvVHgnke1VQ== +"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.20.7", "@babel/parser@^7.22.15", "@babel/parser@^7.23.6", "@babel/parser@^7.24.0", "@babel/parser@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.25.9.tgz#8fcaa079ac7458facfddc5cd705cc8005e4d3817" + integrity sha512-aI3jjAAO1fh7vY/pBGsn1i9LDbRP43+asrRlkPuTXW5yHXtd1NgTEMudbBoDDxrf1daEEfPJqR+JBMakzrR4Dg== + dependencies: + "@babel/types" "^7.25.9" "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.23.3": version "7.23.3" @@ -929,39 +932,35 @@ dependencies: regenerator-runtime "^0.14.0" -"@babel/template@^7.22.15", "@babel/template@^7.3.3": - version "7.22.15" - resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.22.15.tgz#09576efc3830f0430f4548ef971dde1350ef2f38" - integrity sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w== - dependencies: - "@babel/code-frame" "^7.22.13" - "@babel/parser" "^7.22.15" - "@babel/types" "^7.22.15" - -"@babel/traverse@^7.1.0", "@babel/traverse@^7.23.6": - version "7.23.6" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.23.6.tgz#b53526a2367a0dd6edc423637f3d2d0f2521abc5" - integrity sha512-czastdK1e8YByZqezMPFiZ8ahwVMh/ESl9vPgvgdB9AmFMGP5jfpFax74AQgl5zj4XHzqeYAg2l8PuUeRS1MgQ== - dependencies: - "@babel/code-frame" "^7.23.5" - "@babel/generator" "^7.23.6" - "@babel/helper-environment-visitor" "^7.22.20" - "@babel/helper-function-name" "^7.23.0" - "@babel/helper-hoist-variables" "^7.22.5" - "@babel/helper-split-export-declaration" "^7.22.6" - "@babel/parser" "^7.23.6" - "@babel/types" "^7.23.6" +"@babel/template@^7.22.15", "@babel/template@^7.25.9", "@babel/template@^7.3.3": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.25.9.tgz#ecb62d81a8a6f5dc5fe8abfc3901fc52ddf15016" + integrity sha512-9DGttpmPvIxBb/2uwpVo3dqJ+O6RooAFOS+lB+xDqoE2PVCE8nfoHMdZLpfCQRLwvohzXISPZcgxt80xLfsuwg== + dependencies: + "@babel/code-frame" "^7.25.9" + "@babel/parser" "^7.25.9" + "@babel/types" "^7.25.9" + +"@babel/traverse@^7.1.0", "@babel/traverse@^7.23.6", "@babel/traverse@^7.24.0", "@babel/traverse@^7.25.9": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.25.9.tgz#a50f8fe49e7f69f53de5bea7e413cd35c5e13c84" + integrity sha512-ZCuvfwOwlz/bawvAuvcj8rrithP2/N55Tzz342AkTvq4qaWbGfmCk/tKhNaV2cthijKrPAA8SRJV5WWe7IBMJw== + dependencies: + "@babel/code-frame" "^7.25.9" + "@babel/generator" "^7.25.9" + "@babel/parser" "^7.25.9" + "@babel/template" "^7.25.9" + "@babel/types" "^7.25.9" debug "^4.3.1" globals "^11.1.0" -"@babel/types@^7.0.0", "@babel/types@^7.20.7", "@babel/types@^7.22.15", "@babel/types@^7.22.19", "@babel/types@^7.22.5", "@babel/types@^7.23.0", "@babel/types@^7.23.6", "@babel/types@^7.3.3", "@babel/types@^7.4.4": - version "7.23.6" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.23.6.tgz#be33fdb151e1f5a56877d704492c240fc71c7ccd" - integrity sha512-+uarb83brBzPKN38NX1MkB6vb6+mwvR6amUulqAE7ccQw1pEl+bCia9TbdG1lsnFP7lZySvUn37CHyXQdfTwzg== +"@babel/types@^7.0.0", "@babel/types@^7.20.7", "@babel/types@^7.22.15", "@babel/types@^7.22.19", "@babel/types@^7.22.5", "@babel/types@^7.23.0", "@babel/types@^7.23.6", "@babel/types@^7.24.0", "@babel/types@^7.25.9", "@babel/types@^7.3.3", "@babel/types@^7.4.4": + version "7.25.9" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.25.9.tgz#620f35ea1f4233df529ec9a2668d2db26574deee" + integrity sha512-OwS2CM5KocvQ/k7dFJa8i5bNGJP0hXWfVCfDkqRFP1IreH1JDC7wG6eCYCi0+McbfT8OR/kNqsI0UU0xP9H6PQ== dependencies: - "@babel/helper-string-parser" "^7.23.4" - "@babel/helper-validator-identifier" "^7.22.20" - to-fast-properties "^2.0.0" + "@babel/helper-string-parser" "^7.25.9" + "@babel/helper-validator-identifier" "^7.25.9" "@bcoe/v8-coverage@^0.2.3": version "0.2.3" @@ -1157,6 +1156,18 @@ resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-2.0.1.tgz#e5211452df060fa8522b55c7b3c0c4d1981cb044" integrity sha512-dvuCeX5fC9dXgJn9t+X5atfmgQAzUOWqS1254Gh0m6i8wKd10ebXkfNKiRK+1GWi/yTvvLDHpoxLr0xxxeslWw== +"@ianvs/prettier-plugin-sort-imports@^4.3.1": + version "4.3.1" + resolved "https://registry.yarnpkg.com/@ianvs/prettier-plugin-sort-imports/-/prettier-plugin-sort-imports-4.3.1.tgz#e588afa75a597a5d7c26dee1dcc0bb1198363367" + integrity sha512-ZHwbyjkANZOjaBm3ZosADD2OUYGFzQGxfy67HmGZU94mHqe7g1LCMA7YYKB1Cq+UTPCBqlAYapY0KXAjKEw8Sg== + dependencies: + "@babel/core" "^7.24.0" + "@babel/generator" "^7.23.6" + "@babel/parser" "^7.24.0" + "@babel/traverse" "^7.24.0" + "@babel/types" "^7.24.0" + semver "^7.5.2" + "@istanbuljs/load-nyc-config@^1.0.0": version "1.1.0" resolved "https://registry.yarnpkg.com/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz#fd3db1d59ecf7cf121e80650bb86712f9b55eced" @@ -1384,24 +1395,24 @@ "@types/yargs" "^17.0.8" chalk "^4.0.0" -"@jridgewell/gen-mapping@^0.3.0", "@jridgewell/gen-mapping@^0.3.2": - version "0.3.3" - resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz#7e02e6eb5df901aaedb08514203b096614024098" - integrity sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ== +"@jridgewell/gen-mapping@^0.3.0", "@jridgewell/gen-mapping@^0.3.2", "@jridgewell/gen-mapping@^0.3.5": + version "0.3.5" + resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz#dcce6aff74bdf6dad1a95802b69b04a2fcb1fb36" + integrity sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg== dependencies: - "@jridgewell/set-array" "^1.0.1" + "@jridgewell/set-array" "^1.2.1" "@jridgewell/sourcemap-codec" "^1.4.10" - "@jridgewell/trace-mapping" "^0.3.9" + "@jridgewell/trace-mapping" "^0.3.24" "@jridgewell/resolve-uri@^3.1.0": version "3.1.1" resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz#c08679063f279615a3326583ba3a90d1d82cc721" integrity sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA== -"@jridgewell/set-array@^1.0.1": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.2.tgz#7c6cf998d6d20b914c0a55a91ae928ff25965e72" - integrity sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw== +"@jridgewell/set-array@^1.0.1", "@jridgewell/set-array@^1.2.1": + version "1.2.1" + resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.2.1.tgz#558fb6472ed16a4c850b889530e6b36438c49280" + integrity sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A== "@jridgewell/source-map@^0.3.3": version "0.3.5" @@ -1416,7 +1427,7 @@ resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz#d7c6e6755c78567a951e04ab52ef0fd26de59f32" integrity sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg== -"@jridgewell/trace-mapping@^0.3.17", "@jridgewell/trace-mapping@^0.3.18", "@jridgewell/trace-mapping@^0.3.20", "@jridgewell/trace-mapping@^0.3.9": +"@jridgewell/trace-mapping@^0.3.17", "@jridgewell/trace-mapping@^0.3.18", "@jridgewell/trace-mapping@^0.3.20", "@jridgewell/trace-mapping@^0.3.24", "@jridgewell/trace-mapping@^0.3.25", "@jridgewell/trace-mapping@^0.3.9": version "0.3.25" resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz#15f190e98895f3fc23276ee14bc76b675c2e50f0" integrity sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ== @@ -3201,15 +3212,15 @@ browser-process-hrtime@^1.0.0: resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz#3c9b4b7d782c8121e56f10106d84c0d0ffc94626" integrity sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow== -browserslist@^4.21.10, browserslist@^4.22.2: - version "4.23.3" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.23.3.tgz#debb029d3c93ebc97ffbc8d9cbb03403e227c800" - integrity sha512-btwCFJVjI4YWDNfau8RhZ+B1Q/VLoUITrm3RlP6y1tYGWIOa+InuYiRGXUBXo8nA1qKmHMyLB/iVQg5TT4eFoA== +browserslist@^4.21.10, browserslist@^4.22.2, browserslist@^4.24.0: + version "4.24.2" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.24.2.tgz#f5845bc91069dbd55ee89faf9822e1d885d16580" + integrity sha512-ZIc+Q62revdMcqC6aChtW4jz3My3klmCO1fEmINZY/8J3EpBg5/A/D0AKmBveUh6pgoeycoMkVMko84tuYS+Gg== dependencies: - caniuse-lite "^1.0.30001646" - electron-to-chromium "^1.5.4" + caniuse-lite "^1.0.30001669" + electron-to-chromium "^1.5.41" node-releases "^2.0.18" - update-browserslist-db "^1.1.0" + update-browserslist-db "^1.1.1" bs-logger@0.x: version "0.2.6" @@ -3302,10 +3313,10 @@ camelcase@^6.0.0: resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a" integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA== -caniuse-lite@^1.0.30001646: - version "1.0.30001655" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001655.tgz#0ce881f5a19a2dcfda2ecd927df4d5c1684b982f" - integrity sha512-jRGVy3iSGO5Uutn2owlb5gR6qsGngTw9ZTb4ali9f3glshcNmJ2noam4Mo9zia5P9Dk3jNNydy7vQjuE5dQmfg== +caniuse-lite@^1.0.30001646, caniuse-lite@^1.0.30001669: + version "1.0.30001669" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001669.tgz#fda8f1d29a8bfdc42de0c170d7f34a9cf19ed7a3" + integrity sha512-DlWzFDJqstqtIVx1zeSpIMLjunf5SmwOw0N2Ck/QSQdS8PLS4+9HrLaYei4w8BIAL7IB/UEDu889d8vhCTPA0w== capture-exit@^2.0.0: version "2.0.0" @@ -4093,10 +4104,10 @@ ee-first@1.1.1: resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow== -electron-to-chromium@^1.5.4: - version "1.5.13" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.13.tgz#1abf0410c5344b2b829b7247e031f02810d442e6" - integrity sha512-lbBcvtIJ4J6sS4tb5TLp1b4LyfCdMkwStzXPyAgVgTRAsep4bvrAGaBOP7ZJtQMNJpSQ9SqG4brWOroNaQtm7Q== +electron-to-chromium@^1.5.4, electron-to-chromium@^1.5.41: + version "1.5.45" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.45.tgz#fa592ce6a88b44d23acbc7453a2feab98996e6c9" + integrity sha512-vOzZS6uZwhhbkZbcRyiy99Wg+pYFV5hk+5YaECvx0+Z31NR3Tt5zS6dze2OepT6PCTzVzT0dIJItti+uAW5zmw== emittery@^0.7.1: version "0.7.2" @@ -4284,7 +4295,7 @@ esbuild@^0.19.0: "@esbuild/win32-ia32" "0.19.11" "@esbuild/win32-x64" "0.19.11" -escalade@^3.1.2: +escalade@^3.1.2, escalade@^3.2.0: version "3.2.0" resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.2.0.tgz#011a3f69856ba189dffa7dc8fcce99d2a87903e5" integrity sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA== @@ -6412,6 +6423,11 @@ jsesc@^2.5.1: resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4" integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA== +jsesc@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-3.0.2.tgz#bb8b09a6597ba426425f2e4a07245c3d00b9343e" + integrity sha512-xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g== + jsesc@~0.5.0: version "0.5.0" resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d" @@ -7760,10 +7776,10 @@ path-type@^5.0.0: resolved "https://registry.yarnpkg.com/path-type/-/path-type-5.0.0.tgz#14b01ed7aea7ddf9c7c3f46181d4d04f9c785bb8" integrity sha512-5HviZNaZcfqP95rwpv+1HDgUamezbqdSYTyzjTvwtJSnIH+3vnbmWsItli8OFEndS984VT55M3jduxZbX351gg== -picocolors@^1.0.0, picocolors@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.1.tgz#a8ad579b571952f0e5d25892de5445bcfe25aaa1" - integrity sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew== +picocolors@^1.0.0, picocolors@^1.0.1, picocolors@^1.1.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.1.1.tgz#3d321af3eab939b083c8f929a1d12cda81c26b6b" + integrity sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA== picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3, picomatch@^2.3.1: version "2.3.1" @@ -9866,13 +9882,13 @@ untildify@^4.0.0: resolved "https://registry.yarnpkg.com/untildify/-/untildify-4.0.0.tgz#2bc947b953652487e4600949fb091e3ae8cd919b" integrity sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw== -update-browserslist-db@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.1.0.tgz#7ca61c0d8650766090728046e416a8cde682859e" - integrity sha512-EdRAaAyk2cUE1wOf2DkEhzxqOQvFOoRJFNS6NeyJ01Gp2beMRpBAINjM2iDXE3KCuKhwnvHIQCJm6ThL2Z+HzQ== +update-browserslist-db@^1.1.0, update-browserslist-db@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.1.1.tgz#80846fba1d79e82547fb661f8d141e0945755fe5" + integrity sha512-R8UzCaa9Az+38REPiJ1tXlImTJXlVfgHZsglwBD/k6nj76ctsH1E3q4doGrukiLQd3sGQYu56r5+lo5r94l29A== dependencies: - escalade "^3.1.2" - picocolors "^1.0.1" + escalade "^3.2.0" + picocolors "^1.1.0" uri-js@^4.2.2: version "4.4.1"