diff --git a/packages/core/src/application/service/applicationDataSource.ts b/packages/core/src/application/service/applicationDataSource.ts index e5addc0ff25..bcea987ab42 100644 --- a/packages/core/src/application/service/applicationDataSource.ts +++ b/packages/core/src/application/service/applicationDataSource.ts @@ -23,7 +23,7 @@ import { withLatestFrom, } from 'rxjs/operators'; -import { Application } from '../application.model'; +import type { Application } from '../application.model'; import { IEntityTags } from '../../domain'; import { IconNames, robotToHuman } from '../../presentation'; import { ReactInjector } from '../../reactShims'; diff --git a/packages/core/src/cloudProvider/providerSelection/ProviderSelectionModal.tsx b/packages/core/src/cloudProvider/providerSelection/ProviderSelectionModal.tsx index 96d9ec59d0b..9f532d41521 100644 --- a/packages/core/src/cloudProvider/providerSelection/ProviderSelectionModal.tsx +++ b/packages/core/src/cloudProvider/providerSelection/ProviderSelectionModal.tsx @@ -2,8 +2,9 @@ import React from 'react'; import { Modal } from 'react-bootstrap'; import { CloudProviderRegistry } from '../CloudProviderRegistry'; -import { ModalClose } from '../../modal'; -import { IModalComponentProps, ReactModal } from '../../presentation'; +import { ModalClose } from '../../modal/buttons/ModalClose'; +import { ReactModal } from '../../presentation/ReactModal'; +import { IModalComponentProps } from '../../presentation/modal/showModal'; export interface IProviderSelectionModalProps extends IModalComponentProps { providerOptions: string[]; diff --git a/packages/core/src/cluster/filter/ClusterFilterService.ts b/packages/core/src/cluster/filter/ClusterFilterService.ts index 1a5e21c22cf..c63702d3d30 100644 --- a/packages/core/src/cluster/filter/ClusterFilterService.ts +++ b/packages/core/src/cluster/filter/ClusterFilterService.ts @@ -3,7 +3,7 @@ import { Debounce } from 'lodash-decorators'; import { $log } from 'ngimport'; import { Subject } from 'rxjs'; -import { Application } from '../../application/application.model'; +import type { Application } from '../../application/application.model'; import { ICluster, IEntityTags, IInstance, IManagedResourceSummary, IServerGroup } from '../../domain'; import { FilterModelService, ISortFilter } from '../../filterModel'; import { ILabelFilter, trueKeyObjectToLabelFilters } from './labelFilterUtils'; diff --git a/packages/core/src/function/filter/FunctionFilterService.ts b/packages/core/src/function/filter/FunctionFilterService.ts index 282c376757c..7a594a89291 100644 --- a/packages/core/src/function/filter/FunctionFilterService.ts +++ b/packages/core/src/function/filter/FunctionFilterService.ts @@ -2,7 +2,7 @@ import { chain, Dictionary, forOwn, groupBy, intersection, sortBy, values } from import { Debounce } from 'lodash-decorators'; import { Subject } from 'rxjs'; -import { Application } from '../../application/application.model'; +import type { Application } from '../../application/application.model'; import { IFunction, IFunctionGroup } from '../../domain'; import { FilterModelService } from '../../filterModel'; import { FunctionState } from '../../state'; diff --git a/packages/core/src/loadBalancer/filter/LoadBalancerFilterService.ts b/packages/core/src/loadBalancer/filter/LoadBalancerFilterService.ts index 8c4f6bebbd2..ce8d0ca1431 100644 --- a/packages/core/src/loadBalancer/filter/LoadBalancerFilterService.ts +++ b/packages/core/src/loadBalancer/filter/LoadBalancerFilterService.ts @@ -3,7 +3,7 @@ import { Debounce } from 'lodash-decorators'; import { $log } from 'ngimport'; import { Subject } from 'rxjs'; -import { Application } from '../../application/application.model'; +import type { Application } from '../../application/application.model'; import { IInstance, ILoadBalancer, ILoadBalancerGroup, IServerGroup } from '../../domain'; import { FilterModelService, ISortFilter } from '../../filterModel'; import { LoadBalancerState } from '../../state'; diff --git a/packages/core/src/managed/resourceHistory/ManagedResourceHistoryModal.tsx b/packages/core/src/managed/resourceHistory/ManagedResourceHistoryModal.tsx index 3644eed8b60..916897cd15c 100644 --- a/packages/core/src/managed/resourceHistory/ManagedResourceHistoryModal.tsx +++ b/packages/core/src/managed/resourceHistory/ManagedResourceHistoryModal.tsx @@ -4,16 +4,10 @@ import React from 'react'; import { HistoryEventRow } from './HistoryEventRow'; import { ManagedReader } from '../ManagedReader'; import { IManagedResourceSummary } from '../../domain'; -import { - IModalComponentProps, - ModalBody, - ModalHeader, - showModal, - standardGridTableLayout, - Table, - usePollingData, -} from '../../presentation'; -import { Spinner } from '../../widgets'; +import { usePollingData } from '../../presentation/hooks/usePollingData.hook'; +import { IModalComponentProps, ModalBody, ModalHeader, showModal } from '../../presentation/modal'; +import { standardGridTableLayout, Table } from '../../presentation/tables'; +import { Spinner } from '../../widgets/spinners/Spinner'; import './ManagedResourceHistoryModal.less'; diff --git a/packages/core/src/modal/wizard/WizardModal.tsx b/packages/core/src/modal/wizard/WizardModal.tsx index 92c88e3eb8c..d04b81d5ff4 100644 --- a/packages/core/src/modal/wizard/WizardModal.tsx +++ b/packages/core/src/modal/wizard/WizardModal.tsx @@ -9,8 +9,9 @@ import { ModalClose } from '../buttons/ModalClose'; import { SubmitButton } from '../buttons/SubmitButton'; import { SpinFormik } from '../../presentation'; import { IModalComponentProps } from '../../presentation'; -import { TaskMonitor, TaskMonitorWrapper } from '../../task'; -import { Spinner } from '../../widgets'; +import { TaskMonitorWrapper } from '../../task/monitor/TaskMonitorWrapper'; +import { TaskMonitor } from '../../task/monitor/TaskMonitor'; +import { Spinner } from '../../widgets/spinners/Spinner'; export interface IWizardPageInjectedProps { formik: FormikProps; diff --git a/packages/core/src/modal/wizard/WizardStepLabel.tsx b/packages/core/src/modal/wizard/WizardStepLabel.tsx index b32415afae4..86ce202b25b 100644 --- a/packages/core/src/modal/wizard/WizardStepLabel.tsx +++ b/packages/core/src/modal/wizard/WizardStepLabel.tsx @@ -2,7 +2,7 @@ import { isArray, isObject, isString } from 'lodash'; import React from 'react'; import { WizardPage } from './WizardPage'; -import { Tooltip } from '../../presentation'; +import { Tooltip } from '../../presentation/Tooltip'; interface IWizardStepLabelProps { current: boolean; diff --git a/packages/core/src/orchestratedItem/orchestratedItem.transformer.ts b/packages/core/src/orchestratedItem/orchestratedItem.transformer.ts index 751831fcf02..c4a568237c5 100644 --- a/packages/core/src/orchestratedItem/orchestratedItem.transformer.ts +++ b/packages/core/src/orchestratedItem/orchestratedItem.transformer.ts @@ -3,7 +3,7 @@ import { get, isNil } from 'lodash'; import { $log } from 'ngimport'; import { IOrchestratedItem, IOrchestratedItemVariable, ITask, ITaskStep } from '../domain'; -import { ReactInjector } from '../reactShims'; +import { ReactInjector } from '../reactShims/react.injector'; export class OrchestratedItemTransformer { public static addRunningTime(item: any): void { diff --git a/packages/core/src/overrideRegistry/Overridable.tsx b/packages/core/src/overrideRegistry/Overridable.tsx index ac010213a93..fcf02179248 100644 --- a/packages/core/src/overrideRegistry/Overridable.tsx +++ b/packages/core/src/overrideRegistry/Overridable.tsx @@ -4,9 +4,10 @@ import { of as observableOf, Subject } from 'rxjs'; import { map, switchMap, takeUntil } from 'rxjs/operators'; import { AccountService, IAccountDetails } from '../account/AccountService'; -import { CloudProviderRegistry } from '../cloudProvider'; -import { AngularJSAdapter, ReactInjector } from '../reactShims'; -import { Spinner } from '../widgets'; +import { CloudProviderRegistry } from '../cloudProvider/CloudProviderRegistry'; +import { ReactInjector } from '../reactShims/react.injector'; +import { AngularJSAdapter } from '../reactShims/AngularJSAdapter'; +import { Spinner } from '../widgets/spinners/Spinner'; export interface IOverridableProps { accountId?: string; diff --git a/packages/core/src/overrideRegistry/Overrides.tsx b/packages/core/src/overrideRegistry/Overrides.tsx index b5bcc6bfba7..d9c989badab 100644 --- a/packages/core/src/overrideRegistry/Overrides.tsx +++ b/packages/core/src/overrideRegistry/Overrides.tsx @@ -1,6 +1,6 @@ import React from 'react'; -import { CloudProviderRegistry } from '../cloudProvider'; +import { CloudProviderRegistry } from '../cloudProvider/CloudProviderRegistry'; import { OverrideRegistry } from './override.registry'; diff --git a/packages/core/src/pipeline/config/services/PipelineConfigService.ts b/packages/core/src/pipeline/config/services/PipelineConfigService.ts index 508d647d0d0..13ff6e05b09 100644 --- a/packages/core/src/pipeline/config/services/PipelineConfigService.ts +++ b/packages/core/src/pipeline/config/services/PipelineConfigService.ts @@ -3,7 +3,7 @@ import { $q } from 'ngimport'; import { REST } from '../../../api/ApiService'; import { AuthenticationService } from '../../../authentication/AuthenticationService'; -import { ViewStateCache } from '../../../cache'; +import { ViewStateCache } from '../../../cache/viewStateCache'; import { IPipeline } from '../../../domain/IPipeline'; import { IStage } from '../../../domain/IStage'; diff --git a/packages/core/src/pipeline/config/stages/common/AsgActionExecutionDetailsSection.tsx b/packages/core/src/pipeline/config/stages/common/AsgActionExecutionDetailsSection.tsx index 31fbdf98b97..cf36361e577 100644 --- a/packages/core/src/pipeline/config/stages/common/AsgActionExecutionDetailsSection.tsx +++ b/packages/core/src/pipeline/config/stages/common/AsgActionExecutionDetailsSection.tsx @@ -1,8 +1,9 @@ import React from 'react'; -import { ExecutionDetailsSection, IExecutionDetailsSectionProps } from './'; -import { AccountTag } from '../../../../account'; -import { StageExecutionLogs, StageFailureMessage } from '../../../details'; +import { ExecutionDetailsSection, IExecutionDetailsSectionProps } from './ExecutionDetailsSection'; +import { AccountTag } from '../../../../account/AccountTag'; +import { StageExecutionLogs } from '../../../details/StageExecutionLogs'; +import { StageFailureMessage } from '../../../details/StageFailureMessage'; export function AsgActionExecutionDetailsSection(props: IExecutionDetailsSectionProps & { action: string }) { const { action, stage } = props; diff --git a/packages/core/src/pipeline/config/stages/common/ExecutionBarLabel.tsx b/packages/core/src/pipeline/config/stages/common/ExecutionBarLabel.tsx index 975990f6e84..593524aec36 100644 --- a/packages/core/src/pipeline/config/stages/common/ExecutionBarLabel.tsx +++ b/packages/core/src/pipeline/config/stages/common/ExecutionBarLabel.tsx @@ -6,7 +6,7 @@ import { ExecutionWindowActions } from '../executionWindows/ExecutionWindowActio import { HoverablePopover } from '../../../../presentation/HoverablePopover'; import { ReactInjector } from '../../../../reactShims'; import { SkipConditionWait } from '../waitForCondition/SkipConditionWait'; -import { Spinner } from '../../../../widgets'; +import { Spinner } from '../../../../widgets/spinners/Spinner'; export interface IExecutionBarLabelProps extends IExecutionStageLabelProps { tooltip?: JSX.Element; diff --git a/packages/core/src/pipeline/config/triggers/artifacts/custom/CustomArtifactEditor.tsx b/packages/core/src/pipeline/config/triggers/artifacts/custom/CustomArtifactEditor.tsx index f3c5d084836..8f3b051c09e 100644 --- a/packages/core/src/pipeline/config/triggers/artifacts/custom/CustomArtifactEditor.tsx +++ b/packages/core/src/pipeline/config/triggers/artifacts/custom/CustomArtifactEditor.tsx @@ -5,7 +5,7 @@ import { ArtifactEditor } from '../ArtifactEditor'; import { ArtifactTypePatterns } from '../../../../../artifact'; import { IArtifactEditorProps, IArtifactKindConfig } from '../../../../../domain'; import { StageConfigField } from '../../../stages/common'; -import { SpelText } from '../../../../../widgets'; +import { SpelText } from '../../../../../widgets/spelText/SpelText'; export const TYPE = 'custom/object'; export const CUSTOM_ARTIFACT_ACCOUNT = 'custom-artifact'; diff --git a/packages/core/src/pipeline/config/triggers/artifacts/singleFieldArtifactEditor.tsx b/packages/core/src/pipeline/config/triggers/artifacts/singleFieldArtifactEditor.tsx index 364315508d9..35c54374908 100644 --- a/packages/core/src/pipeline/config/triggers/artifacts/singleFieldArtifactEditor.tsx +++ b/packages/core/src/pipeline/config/triggers/artifacts/singleFieldArtifactEditor.tsx @@ -4,7 +4,7 @@ import React from 'react'; import { ArtifactEditor } from './ArtifactEditor'; import { IArtifact, IArtifactEditorProps } from '../../../../domain'; import { StageConfigField } from '../../stages/common'; -import { SpelText } from '../../../../widgets'; +import { SpelText } from '../../../../widgets/spelText/SpelText'; export const singleFieldArtifactEditor = ( fieldKey: keyof IArtifact, diff --git a/packages/core/src/pipeline/details/stageSummary.component.ts b/packages/core/src/pipeline/details/stageSummary.component.ts index 0fd6116c479..ee59f1644b8 100644 --- a/packages/core/src/pipeline/details/stageSummary.component.ts +++ b/packages/core/src/pipeline/details/stageSummary.component.ts @@ -4,7 +4,7 @@ import { HtmlRenderer, Parser } from 'commonmark'; import { Application } from '../../application'; import { ConfirmationModalService } from '../../confirmationModal'; import { IExecution, IExecutionStage, IExecutionStageSummary, IStage } from '../../domain'; -import { Registry } from '../../registry'; +import { Registry } from '../../registry/Registry'; import { ExecutionService } from '../service/execution.service'; diff --git a/packages/core/src/pipeline/executions/execution/ExecutionMarkerInformationModal.tsx b/packages/core/src/pipeline/executions/execution/ExecutionMarkerInformationModal.tsx index 60b84806225..32980ed7943 100644 --- a/packages/core/src/pipeline/executions/execution/ExecutionMarkerInformationModal.tsx +++ b/packages/core/src/pipeline/executions/execution/ExecutionMarkerInformationModal.tsx @@ -5,7 +5,7 @@ import { Modal } from 'react-bootstrap'; import { PipelineGraph } from '../../config/graph/PipelineGraph'; import { IExecution, IExecutionStageSummary } from '../../../domain'; import { ExecutionInformationService } from './executionInformation.service'; -import { Spinner } from '../../../index'; +import { Spinner } from '../../../widgets/spinners/Spinner'; import { ParametersAndArtifacts } from '../../status/ParametersAndArtifacts'; import { duration, relativeTime, timestamp } from '../../../utils'; diff --git a/packages/core/src/pipeline/filter/executionFilter.service.ts b/packages/core/src/pipeline/filter/executionFilter.service.ts index 6fb852da386..a0f459f4453 100644 --- a/packages/core/src/pipeline/filter/executionFilter.service.ts +++ b/packages/core/src/pipeline/filter/executionFilter.service.ts @@ -4,7 +4,7 @@ import { DateTime, Duration } from 'luxon'; import { $log } from 'ngimport'; import { Subject } from 'rxjs'; -import { Application } from '../../application/application.model'; +import type { Application } from '../../application/application.model'; import { IExecution, IExecutionGroup, IPipeline, IPipelineTag } from '../../domain'; import { FilterModelService, ISortFilter } from '../../filterModel'; import { Registry } from '../../registry'; diff --git a/packages/core/src/plugins/plugin.registry.ts b/packages/core/src/plugins/plugin.registry.ts index 5cbef43bcc1..e0679ca9ddf 100644 --- a/packages/core/src/plugins/plugin.registry.ts +++ b/packages/core/src/plugins/plugin.registry.ts @@ -167,6 +167,6 @@ export class PluginRegistry { private loadModuleFromUrl(url: string) { // This inline comment is used by webpack to emit a native import() (instead of doing a webpack import) // See: https://webpack.js.org/api/module-methods/ - return import(/* webpackIgnore: true */ url); + return import(/* webpackIgnore: true */ /* @vite-ignore */ url); } } diff --git a/packages/core/src/presentation/TabBoundary.tsx b/packages/core/src/presentation/TabBoundary.tsx index 4c2c4da71c4..e8755d945fd 100644 --- a/packages/core/src/presentation/TabBoundary.tsx +++ b/packages/core/src/presentation/TabBoundary.tsx @@ -1,6 +1,6 @@ import React from 'react'; -import { useEventListener } from '../index'; +import { useEventListener } from './hooks/useEventListener.hook'; export const TabBoundary = ({ children }: { children: React.ReactNode }) => { const boundaryRef = React.createRef(); diff --git a/packages/core/src/presentation/collapsibleSection/CollapsibleSection.tsx b/packages/core/src/presentation/collapsibleSection/CollapsibleSection.tsx index 9b0e8bc5a9a..bfa3b8f2f19 100644 --- a/packages/core/src/presentation/collapsibleSection/CollapsibleSection.tsx +++ b/packages/core/src/presentation/collapsibleSection/CollapsibleSection.tsx @@ -1,9 +1,8 @@ import classnames from 'classnames'; import React from 'react'; -import { IIconProps } from '@spinnaker/presentation'; -import { CollapsibleSectionStateCache } from '../../cache'; -import { Icon } from '../../index'; +import { Icon, IIconProps } from '@spinnaker/presentation'; +import { CollapsibleSectionStateCache } from '../../cache/collapsibleSectionStateCache'; export interface ICollapsibleSectionProps { outerDivClassName?: string; diff --git a/packages/core/src/task/TrafficGuardHelperLink.tsx b/packages/core/src/task/TrafficGuardHelperLink.tsx index 65b2dd4b01f..a3d62e9b200 100644 --- a/packages/core/src/task/TrafficGuardHelperLink.tsx +++ b/packages/core/src/task/TrafficGuardHelperLink.tsx @@ -1,6 +1,6 @@ import React from 'react'; -import { ReactInjector } from '../reactShims'; +import { ReactInjector } from '../reactShims/react.injector'; export interface ITrafficGuardHelperLinkProps { errorMessage: string; diff --git a/packages/core/src/task/monitor/TaskMonitorError.tsx b/packages/core/src/task/monitor/TaskMonitorError.tsx index 4de4bf6be84..2f1170abe00 100644 --- a/packages/core/src/task/monitor/TaskMonitorError.tsx +++ b/packages/core/src/task/monitor/TaskMonitorError.tsx @@ -4,7 +4,7 @@ import React from 'react'; import { TrafficGuardHelperLink } from '../TrafficGuardHelperLink'; import { ITask } from '../../domain'; import { Markdown } from '../../presentation'; -import { ReactInjector } from '../../reactShims'; +import { ReactInjector } from '../../reactShims/react.injector'; export interface ITaskMonitorErrorProps { errorMessage: string; diff --git a/packages/core/src/task/monitor/TaskMonitorStatus.tsx b/packages/core/src/task/monitor/TaskMonitorStatus.tsx index aae1493088f..852d3df27eb 100644 --- a/packages/core/src/task/monitor/TaskMonitorStatus.tsx +++ b/packages/core/src/task/monitor/TaskMonitorStatus.tsx @@ -4,9 +4,9 @@ import { StatusGlyph } from '../StatusGlyph'; import { TaskMonitor } from './TaskMonitor'; import { displayableTasks } from '../displayableTasks.filter'; import { robotToHuman, useForceUpdate, useObservable } from '../../presentation'; -import { ReactInjector } from '../../reactShims'; +import { ReactInjector } from '../../reactShims/react.injector'; import { duration } from '../../utils'; -import { Spinner } from '../../widgets'; +import { Spinner } from '../../widgets/spinners/Spinner'; export const TaskMonitorStatus = ({ monitor }: { monitor: TaskMonitor }) => { const forceUpdate = useForceUpdate(); diff --git a/packages/core/src/widgets/ApplicationsPickerInput.tsx b/packages/core/src/widgets/ApplicationsPickerInput.tsx index 958ff42a1eb..baf2ec4a862 100644 --- a/packages/core/src/widgets/ApplicationsPickerInput.tsx +++ b/packages/core/src/widgets/ApplicationsPickerInput.tsx @@ -1,6 +1,6 @@ import React, { useMemo } from 'react'; -import { ApplicationReader } from '../application'; +import { ApplicationReader } from '../application/service/ApplicationReader'; import { asyncMessage, errorMessage,