From ecc6498639fab9452c0dce7d698ff516c24433ca Mon Sep 17 00:00:00 2001 From: Lais Portugal Date: Fri, 2 Aug 2024 13:47:06 +0100 Subject: [PATCH] Renaming package studio to suite --- .github/workflows/post-release.yml | 2 +- benchmark/package.json | 2 +- benchmark/src/players/BenchmarkPlayer.ts | 2 +- benchmark/src/players/PointcloudPlayer.ts | 2 +- benchmark/src/players/SinewavePlayer.ts | 2 +- benchmark/src/players/TransformPlayer.ts | 2 +- .../src/players/TransformPreloadingPlayer.ts | 2 +- package.json | 2 +- packages/studio-base/package.json | 2 +- .../src/PanelAPI/useBlocksSubscriptions.ts | 2 +- .../src/PanelAPI/useDataSourceInfo.ts | 2 +- .../src/components/ExtensionDetails.tsx | 2 +- .../components/ExtensionsSettings/index.tsx | 2 +- .../MessagePathSyntax/filterMatches.ts | 2 +- .../messagePathsForDatatype.ts | 2 +- .../simpleGetMessagePathDataItems.test.ts | 2 +- .../simpleGetMessagePathDataItems.ts | 2 +- .../MessagePathSyntax/stringifyRosPath.ts | 2 +- .../useCachedGetMessagePathDataItems.ts | 2 +- .../components/MessagePipeline/FakePlayer.ts | 2 +- .../MockMessagePipelineProvider.tsx | 2 +- .../src/components/MessagePipeline/index.tsx | 2 +- .../src/components/MessagePipeline/store.ts | 2 +- .../MessagePipeline/subscriptions.ts | 2 +- .../src/components/MessagePipeline/types.ts | 2 +- .../src/components/PanelContextMenu.tsx | 2 +- .../PanelExtensionAdapter.stories.tsx | 8 +++---- .../PanelExtensionAdapter.test.tsx | 2 +- .../PanelExtensionAdapter.tsx | 22 ++++++++--------- .../messageProcessing.ts | 6 ++--- .../PanelExtensionAdapter/renderState.ts | 20 ++++++++-------- .../components/PanelExtensionAdapter/types.ts | 2 +- .../useSharedPanelState.ts | 2 +- .../PanelSettings/index.stories.tsx | 2 +- .../src/components/PanelSettings/index.tsx | 2 +- .../PlaybackControls/ProgressPlot.tsx | 2 +- .../src/components/PlayerManager.tsx | 2 +- .../SettingsTreeEditor/FieldEditor.tsx | 2 +- .../SettingsTreeEditor/NodeActionsMenu.tsx | 2 +- .../SettingsTreeEditor/NodeEditor.tsx | 8 +++---- .../components/SettingsTreeEditor/icons.ts | 2 +- .../SettingsTreeEditor/index.stories.tsx | 10 ++++---- .../components/SettingsTreeEditor/index.tsx | 2 +- .../components/SettingsTreeEditor/utils.ts | 2 +- .../studio-base/src/components/Sparkline.tsx | 2 +- .../useStudioLogsSettingsTree.ts | 2 +- .../TimeBasedChartTooltipContent.tsx | 2 +- .../TimeBasedChart/downsampleStates.ts | 2 +- .../TopicList/getMessagePathSearchItems.ts | 2 +- .../TopicList/useTopicListSearch.ts | 2 +- .../src/components/VariablesList/Variable.tsx | 2 +- .../src/components/WssErrorModal.tsx | 2 +- .../studio-base/src/context/AppContext.ts | 2 +- .../context/CurrentLayoutContext/actions.ts | 2 +- .../src/context/CurrentLayoutContext/index.ts | 2 +- .../studio-base/src/context/EventsContext.ts | 2 +- .../src/context/ExtensionCatalogContext.ts | 6 ++--- .../src/context/PanelStateContext.ts | 2 +- .../src/context/ProblemsContext.ts | 2 +- .../TimelineInteractionStateContext.tsx | 2 +- .../studio-base/src/hooks/useAppTimeFormat.ts | 2 +- .../src/hooks/useGlobalVariables.ts | 2 +- .../studio-base/src/hooks/usePublisher.tsx | 2 +- .../src/hooks/useTopicPublishFrequences.ts | 2 +- .../src/panels/CallService/CallService.tsx | 2 +- .../src/panels/CallService/index.tsx | 2 +- .../src/panels/CallService/settings.ts | 2 +- .../studio-base/src/panels/Gauge/Gauge.tsx | 2 +- .../studio-base/src/panels/Gauge/index.tsx | 2 +- .../studio-base/src/panels/Gauge/settings.ts | 2 +- .../src/panels/Indicator/Indicator.tsx | 2 +- .../src/panels/Indicator/index.tsx | 2 +- .../src/panels/Indicator/settings.ts | 2 +- packages/studio-base/src/panels/Log/Stamp.tsx | 2 +- .../studio-base/src/panels/Log/conversion.tsx | 2 +- packages/studio-base/src/panels/Log/index.tsx | 2 +- .../studio-base/src/panels/Log/settings.ts | 2 +- packages/studio-base/src/panels/Log/types.ts | 2 +- .../studio-base/src/panels/Map/MapPanel.tsx | 14 +++++------ packages/studio-base/src/panels/Map/config.ts | 2 +- .../studio-base/src/panels/Map/initPanel.tsx | 2 +- .../studio-base/src/panels/Map/support.ts | 2 +- packages/studio-base/src/panels/Map/types.ts | 2 +- .../src/panels/Parameters/index.stories.tsx | 2 +- .../src/panels/Parameters/index.tsx | 2 +- .../src/panels/PlaybackPerformance/index.tsx | 2 +- .../src/panels/Plot/ChartRenderer.ts | 2 +- .../panels/Plot/OffscreenCanvasRenderer.ts | 2 +- packages/studio-base/src/panels/Plot/Plot.tsx | 2 +- .../src/panels/Plot/PlotCoordinator.ts | 2 +- .../src/panels/Plot/PlotLegend.tsx | 2 +- .../src/panels/Plot/PlotLegendRow.tsx | 2 +- .../Plot/builders/BlockTopicCursor.test.ts | 2 +- .../panels/Plot/builders/BlockTopicCursor.ts | 2 +- .../builders/CurrentCustomDatasetsBuilder.ts | 2 +- .../builders/CustomDatasetsBuilder.test.ts | 2 +- .../Plot/builders/CustomDatasetsBuilder.ts | 2 +- .../builders/CustomDatasetsBuilderImpl.ts | 2 +- .../panels/Plot/builders/IDatasetsBuilder.ts | 2 +- .../Plot/builders/IndexDatasetsBuilder.ts | 2 +- .../builders/TimestampDatasetsBuilder.test.ts | 2 +- .../Plot/builders/TimestampDatasetsBuilder.ts | 2 +- .../builders/TimestampDatasetsBuilderImpl.ts | 2 +- .../studio-base/src/panels/Plot/config.ts | 2 +- packages/studio-base/src/panels/Plot/csv.ts | 2 +- packages/studio-base/src/panels/Plot/datum.ts | 2 +- .../studio-base/src/panels/Plot/settings.ts | 2 +- .../src/panels/Plot/subscription.ts | 2 +- .../src/panels/Publish/buildSampleMessage.ts | 2 +- .../studio-base/src/panels/Publish/index.tsx | 2 +- .../src/panels/Publish/settings.ts | 2 +- .../src/panels/RawMessages/Toolbar.tsx | 2 +- .../src/panels/RawMessages/index.tsx | 2 +- .../src/panels/StateTransitions/index.tsx | 2 +- .../src/panels/StateTransitions/settings.ts | 2 +- .../src/panels/Teleop/TeleopPanel.tsx | 8 +++---- .../studio-base/src/panels/Teleop/index.tsx | 2 +- .../src/panels/ThreeDeeRender/IRenderer.ts | 16 ++++++------- .../Interactions/Interactions.tsx | 2 +- .../ThreeDeeRender/Interactions/TopicLink.tsx | 2 +- .../panels/ThreeDeeRender/Renderer.test.ts | 2 +- .../src/panels/ThreeDeeRender/Renderer.ts | 22 ++++++++--------- .../panels/ThreeDeeRender/RendererOverlay.tsx | 2 +- .../panels/ThreeDeeRender/SceneExtension.ts | 2 +- .../panels/ThreeDeeRender/SettingsManager.ts | 2 +- .../panels/ThreeDeeRender/ThreeDeeRender.tsx | 18 +++++++------- .../renderables/CameraStateSettings.ts | 2 +- .../ThreeDeeRender/renderables/Cameras.ts | 2 +- .../renderables/FoxgloveGrid.ts | 2 +- .../ThreeDeeRender/renderables/FrameAxes.ts | 4 ++-- .../ThreeDeeRender/renderables/Grids.ts | 2 +- .../renderables/ImageMode/ImageMode.ts | 14 +++++------ .../ImageMode/MessageHandler.test.ts | 2 +- .../renderables/ImageMode/MessageHandler.ts | 2 +- .../ImageMode/annotations/ImageAnnotations.ts | 2 +- .../ThreeDeeRender/renderables/Images.ts | 2 +- .../ThreeDeeRender/renderables/LaserScans.ts | 2 +- .../ThreeDeeRender/renderables/Markers.ts | 2 +- .../renderables/OccupancyGrids.ts | 2 +- .../ThreeDeeRender/renderables/PointClouds.ts | 2 +- .../ThreeDeeRender/renderables/Polygons.ts | 2 +- .../ThreeDeeRender/renderables/PoseArrays.ts | 2 +- .../ThreeDeeRender/renderables/Poses.ts | 2 +- .../renderables/PublishSettings.ts | 2 +- .../renderables/SceneEntities.ts | 2 +- .../renderables/SceneSettings.ts | 2 +- .../ThreeDeeRender/renderables/Urdfs.ts | 8 +++---- .../renderables/VelodyneScans.ts | 2 +- .../ThreeDeeRender/renderables/colorMode.ts | 2 +- .../renderables/pointExtensionUtils.ts | 2 +- .../src/panels/ThreeDeeRender/settings.ts | 2 +- .../stories/ArrowMarkers.stories.tsx | 2 +- .../stories/AutoSelectFrame.stories.tsx | 2 +- .../stories/CameraInfoRender.stories.tsx | 2 +- .../stories/ColladaUpAxis.stories.tsx | 2 +- .../stories/EditableTransform.stories.tsx | 2 +- .../stories/FramelessMarkers.stories.tsx | 2 +- .../stories/GeometryMsgs_Polygon.stories.tsx | 2 +- .../GeometryMsgs_PoseArray.stories.tsx | 2 +- .../GeometryMsgs_PoseStamped.stories.tsx | 2 +- .../ImageMode/ImageAnnotations.stories.tsx | 2 +- .../stories/ImageMode/ImageMode.stories.tsx | 2 +- .../ImageMode/ImageOnlyMode.stories.tsx | 2 +- .../ImageMode/ImagePanZoomRotate.stories.tsx | 2 +- .../stories/ImageMode/imageCommon.ts | 2 +- .../stories/ImageRender.stories.tsx | 2 +- .../stories/LabelMarkers.stories.tsx | 2 +- .../stories/LargeTransform.stories.tsx | 2 +- .../stories/MarkerLifetimes.stories.tsx | 2 +- .../Marker_PointCloud2_Alignment.stories.tsx | 2 +- .../stories/Markers.stories.tsx | 2 +- .../stories/MeasurementTool.stories.tsx | 2 +- .../stories/MeshMarkerOrientation.stories.tsx | 2 +- .../stories/MeshMarkers.stories.tsx | 2 +- .../stories/NavMsgs_Path.stories.tsx | 2 +- .../stories/OccupancyGrid.stories.tsx | 2 +- .../stories/PoseMarkers.stories.tsx | 2 +- .../stories/PublishClickTool.stories.tsx | 2 +- .../stories/SceneEntities.stories.tsx | 2 +- .../stories/SensorMsgs_LaserScan.stories.tsx | 2 +- .../SensorMsgs_PointCloud2.stories.tsx | 2 +- .../SphereListPointsTransform.stories.tsx | 2 +- .../TransformInterpolation.stories.tsx | 2 +- .../ThreeDeeRender/stories/Urdfs.stories.tsx | 2 +- .../panels/ThreeDeeRender/stories/common.ts | 2 +- .../foxglove.FrameTransform.stories.tsx | 2 +- .../foxglove.FrameTransforms.stories.tsx | 2 +- .../stories/foxglove.Grid.stories.tsx | 2 +- .../stories/foxglove.LaserScan.stories.tsx | 2 +- .../stories/foxglove.PointCloud.stories.tsx | 2 +- .../stories/foxglove.PoseInFrame.stories.tsx | 2 +- .../stories/foxglove.PosesInFrame.stories.tsx | 2 +- .../topicIsConvertibleToSchema.ts | 2 +- .../src/panels/UserScriptEditor/index.tsx | 2 +- .../src/panels/VariableSlider/settings.ts | 2 +- .../diagnostics/DiagnosticStatusPanel.tsx | 2 +- .../panels/diagnostics/DiagnosticSummary.tsx | 2 +- .../src/panels/diagnostics/settings.ts | 2 +- .../players/FoxgloveWebSocketPlayer/index.ts | 2 +- .../IterablePlayer/BlockLoader.test.ts | 2 +- .../src/players/IterablePlayer/BlockLoader.ts | 2 +- .../BufferedIterableSource.test.ts | 2 +- .../IterablePlayer/BufferedIterableSource.ts | 2 +- .../CachingIterableSource.test.ts | 2 +- .../IterablePlayer/CachingIterableSource.ts | 2 +- .../players/IterablePlayer/IIterableSource.ts | 2 +- .../players/IterablePlayer/IterablePlayer.ts | 2 +- .../players/IterablePlayer/IteratorCursor.ts | 2 +- .../Mcap/McapIndexedIterableSource.ts | 2 +- .../Mcap/McapUnindexedIterableSource.ts | 2 +- .../IterablePlayer/WorkerIterableSource.ts | 2 +- .../WorkerIterableSourceWorker.ts | 2 +- .../IterablePlayer/freezeMetadata.test.ts | 2 +- .../players/IterablePlayer/freezeMetadata.ts | 2 +- .../rosdb3/RosDb3IterableSource.ts | 2 +- .../IterablePlayer/ulog/UlogIterableSource.ts | 2 +- .../studio-base/src/players/Ros1Player.ts | 2 +- .../src/players/RosbridgePlayer.ts | 2 +- .../AliasingStateProcessor.ts | 2 +- .../BlockTopicProcessor.ts | 2 +- .../StateProcessorFactory.ts | 2 +- .../TopicAliasingPlayer.ts | 2 +- .../TopicAliasingPlayer/aliasing.test.ts | 2 +- .../players/TopicAliasingPlayer/aliasing.ts | 2 +- .../src/players/TopicAliasingPlayer/mocks.ts | 2 +- .../src/players/UserScriptPlayer/index.ts | 2 +- .../players/UserScriptPlayer/subscriptions.ts | 2 +- .../studio-base/src/players/VelodynePlayer.ts | 2 +- packages/studio-base/src/players/types.ts | 4 ++-- .../providers/CurrentLayoutProvider/index.tsx | 2 +- .../providers/ExtensionCatalogProvider.tsx | 12 +++++----- .../studio-base/src/stories/PanelSetup.tsx | 12 +++++----- .../studio-base/src/test/mocks/mockMessage.ts | 2 +- packages/studio-base/src/types/Bounds.ts | 2 +- packages/studio-base/src/util/enums.ts | 2 +- packages/studio-base/src/util/time.test.ts | 2 +- packages/{studio => suite}/README.md | 0 packages/{studio => suite}/package.json | 4 ++-- packages/{studio => suite}/src/immutable.ts | 0 packages/{studio => suite}/src/index.ts | 0 packages/{studio => suite}/tsconfig.json | 0 yarn.lock | 24 +++++++++---------- 242 files changed, 338 insertions(+), 338 deletions(-) rename packages/{studio => suite}/README.md (100%) rename packages/{studio => suite}/package.json (89%) rename packages/{studio => suite}/src/immutable.ts (100%) rename packages/{studio => suite}/src/index.ts (100%) rename packages/{studio => suite}/tsconfig.json (100%) diff --git a/.github/workflows/post-release.yml b/.github/workflows/post-release.yml index 646144894e2..aaaf77c241f 100644 --- a/.github/workflows/post-release.yml +++ b/.github/workflows/post-release.yml @@ -62,7 +62,7 @@ jobs: - run: yarn install --immutable - - run: npm publish ./packages/studio + - run: npm publish ./packages/suite env: NODE_AUTH_TOKEN: ${{ secrets.NPM_PUBLISH_TOKEN }} diff --git a/benchmark/package.json b/benchmark/package.json index 236fd0811d0..8814fd0a924 100644 --- a/benchmark/package.json +++ b/benchmark/package.json @@ -10,7 +10,7 @@ "@foxglove/tsconfig": "2.0.0", "@lichtblick/den": "workspace:*", "@lichtblick/log": "workspace:*", - "@lichtblick/studio": "workspace:*", + "@lichtblick/suite": "workspace:*", "@pmmmwh/react-refresh-webpack-plugin": "0.5.11", "@types/react": "18.2.56", "@types/react-dom": "18.2.7", diff --git a/benchmark/src/players/BenchmarkPlayer.ts b/benchmark/src/players/BenchmarkPlayer.ts index 1e67016d982..12c37a8f580 100644 --- a/benchmark/src/players/BenchmarkPlayer.ts +++ b/benchmark/src/players/BenchmarkPlayer.ts @@ -4,7 +4,6 @@ import { filterMap } from "@lichtblick/den/collection"; import Log from "@lichtblick/log"; -import { MessageEvent } from "@lichtblick/studio"; import { GlobalVariables } from "@lichtblick/studio-base/hooks/useGlobalVariables"; import { BlockLoader } from "@lichtblick/studio-base/players/IterablePlayer/BlockLoader"; import { IIterableSource } from "@lichtblick/studio-base/players/IterablePlayer/IIterableSource"; @@ -20,6 +19,7 @@ import { SubscribePayload, } from "@lichtblick/studio-base/players/types"; import delay from "@lichtblick/studio-base/util/delay"; +import { MessageEvent } from "@lichtblick/suite"; import { toRFC3339String } from "@foxglove/rostime"; diff --git a/benchmark/src/players/PointcloudPlayer.ts b/benchmark/src/players/PointcloudPlayer.ts index ffa370725b8..5b4a94da786 100644 --- a/benchmark/src/players/PointcloudPlayer.ts +++ b/benchmark/src/players/PointcloudPlayer.ts @@ -3,7 +3,6 @@ // file, You can obtain one at http://mozilla.org/MPL/2.0/ import Log from "@lichtblick/log"; -import { MessageEvent } from "@lichtblick/studio"; import { GlobalVariables } from "@lichtblick/studio-base/hooks/useGlobalVariables"; import { AdvertiseOptions, @@ -16,6 +15,7 @@ import { TopicStats, } from "@lichtblick/studio-base/players/types"; import { RosDatatypes } from "@lichtblick/studio-base/types/RosDatatypes"; +import { MessageEvent } from "@lichtblick/suite"; import * as rostime from "@foxglove/rostime"; import { Time } from "@foxglove/rostime"; diff --git a/benchmark/src/players/SinewavePlayer.ts b/benchmark/src/players/SinewavePlayer.ts index 8ed85678a51..55909d15bb3 100644 --- a/benchmark/src/players/SinewavePlayer.ts +++ b/benchmark/src/players/SinewavePlayer.ts @@ -3,7 +3,6 @@ // file, You can obtain one at http://mozilla.org/MPL/2.0/ import Log from "@lichtblick/log"; -import { MessageEvent } from "@lichtblick/studio"; import { GlobalVariables } from "@lichtblick/studio-base/hooks/useGlobalVariables"; import { AdvertiseOptions, @@ -16,6 +15,7 @@ import { TopicStats, } from "@lichtblick/studio-base/players/types"; import { RosDatatypes } from "@lichtblick/studio-base/types/RosDatatypes"; +import { MessageEvent } from "@lichtblick/suite"; import * as rostime from "@foxglove/rostime"; import { Time } from "@foxglove/rostime"; diff --git a/benchmark/src/players/TransformPlayer.ts b/benchmark/src/players/TransformPlayer.ts index 40121ef99c5..44a52572232 100644 --- a/benchmark/src/players/TransformPlayer.ts +++ b/benchmark/src/players/TransformPlayer.ts @@ -3,7 +3,6 @@ // file, You can obtain one at http://mozilla.org/MPL/2.0/ import Log from "@lichtblick/log"; -import { MessageEvent } from "@lichtblick/studio"; import { GlobalVariables } from "@lichtblick/studio-base/hooks/useGlobalVariables"; import { AdvertiseOptions, @@ -17,6 +16,7 @@ import { } from "@lichtblick/studio-base/players/types"; import { RosDatatypes } from "@lichtblick/studio-base/types/RosDatatypes"; import { Quaternion } from "@lichtblick/studio-base/util/geometry"; +import { MessageEvent } from "@lichtblick/suite"; import * as rostime from "@foxglove/rostime"; import { Time } from "@foxglove/rostime"; diff --git a/benchmark/src/players/TransformPreloadingPlayer.ts b/benchmark/src/players/TransformPreloadingPlayer.ts index 1ab2b036357..1377107bd14 100644 --- a/benchmark/src/players/TransformPreloadingPlayer.ts +++ b/benchmark/src/players/TransformPreloadingPlayer.ts @@ -3,7 +3,6 @@ // file, You can obtain one at http://mozilla.org/MPL/2.0/ import Log from "@lichtblick/log"; -import { MessageEvent } from "@lichtblick/studio"; import { GlobalVariables } from "@lichtblick/studio-base/hooks/useGlobalVariables"; import { normalizeFrameTransform } from "@lichtblick/studio-base/panels/ThreeDeeRender/normalizeMessages"; import { @@ -21,6 +20,7 @@ import { } from "@lichtblick/studio-base/players/types"; import { RosDatatypes } from "@lichtblick/studio-base/types/RosDatatypes"; import delay from "@lichtblick/studio-base/util/delay"; +import { MessageEvent } from "@lichtblick/suite"; import { Time, compare } from "@foxglove/rostime"; import { FrameTransform, Vector3 } from "@foxglove/schemas"; diff --git a/package.json b/package.json index 8bb1855baa5..34802cbe831 100644 --- a/package.json +++ b/package.json @@ -130,7 +130,7 @@ "dependencies": { "@lichtblick/hooks": "workspace:*", "@lichtblick/log": "workspace:*", - "@lichtblick/studio": "workspace:*", + "@lichtblick/suite": "workspace:*", "@mui/material": "5.13.5", "react-use": "17.5.1", "rehype-raw": "6.1.1", diff --git a/packages/studio-base/package.json b/packages/studio-base/package.json index 655e4dc5fa9..1cf3cbf9eb0 100644 --- a/packages/studio-base/package.json +++ b/packages/studio-base/package.json @@ -51,7 +51,7 @@ "@lichtblick/den": "workspace:*", "@lichtblick/hooks": "workspace:*", "@lichtblick/log": "workspace:*", - "@lichtblick/studio": "workspace:*", + "@lichtblick/suite": "workspace:*", "@mcap/core": "2.0.2", "@mui/icons-material": "5.15.5", "@mui/material": "5.13.5", diff --git a/packages/studio-base/src/PanelAPI/useBlocksSubscriptions.ts b/packages/studio-base/src/PanelAPI/useBlocksSubscriptions.ts index 34afc4f1892..a3564e829df 100644 --- a/packages/studio-base/src/PanelAPI/useBlocksSubscriptions.ts +++ b/packages/studio-base/src/PanelAPI/useBlocksSubscriptions.ts @@ -11,7 +11,6 @@ // found at http://www.apache.org/licenses/LICENSE-2.0 // You may not use this file except in compliance with the License. -import { Immutable } from "@lichtblick/studio"; import { MessagePipelineContext, useMessagePipeline, @@ -21,6 +20,7 @@ import { MessageBlock as PlayerMessageBlock, SubscribePayload, } from "@lichtblick/studio-base/players/types"; +import { Immutable } from "@lichtblick/suite"; import memoizeWeak from "memoize-weak"; import { useCallback, useEffect, useMemo, useState } from "react"; import { v4 as uuidv4 } from "uuid"; diff --git a/packages/studio-base/src/PanelAPI/useDataSourceInfo.ts b/packages/studio-base/src/PanelAPI/useDataSourceInfo.ts index d5a738792a6..b47d39cda60 100644 --- a/packages/studio-base/src/PanelAPI/useDataSourceInfo.ts +++ b/packages/studio-base/src/PanelAPI/useDataSourceInfo.ts @@ -11,13 +11,13 @@ // found at http://www.apache.org/licenses/LICENSE-2.0 // You may not use this file except in compliance with the License. -import { Immutable, Time } from "@lichtblick/studio"; import { MessagePipelineContext, useMessagePipeline, } from "@lichtblick/studio-base/components/MessagePipeline"; import { Topic } from "@lichtblick/studio-base/players/types"; import { RosDatatypes } from "@lichtblick/studio-base/types/RosDatatypes"; +import { Immutable, Time } from "@lichtblick/suite"; import { useMemo } from "react"; function selectDatatypes(ctx: MessagePipelineContext) { diff --git a/packages/studio-base/src/components/ExtensionDetails.tsx b/packages/studio-base/src/components/ExtensionDetails.tsx index b44e075ae56..c5ecf4052f0 100644 --- a/packages/studio-base/src/components/ExtensionDetails.tsx +++ b/packages/studio-base/src/components/ExtensionDetails.tsx @@ -2,7 +2,6 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { Immutable } from "@lichtblick/studio"; import Stack from "@lichtblick/studio-base/components/Stack"; import TextContent from "@lichtblick/studio-base/components/TextContent"; import { useAnalytics } from "@lichtblick/studio-base/context/AnalyticsContext"; @@ -13,6 +12,7 @@ import { } from "@lichtblick/studio-base/context/ExtensionMarketplaceContext"; import { AppEvent } from "@lichtblick/studio-base/services/IAnalytics"; import isDesktopApp from "@lichtblick/studio-base/util/isDesktopApp"; +import { Immutable } from "@lichtblick/suite"; import ChevronLeftIcon from "@mui/icons-material/ChevronLeft"; import { Button, Link, Tab, Tabs, Typography, Divider } from "@mui/material"; import { useSnackbar } from "notistack"; diff --git a/packages/studio-base/src/components/ExtensionsSettings/index.tsx b/packages/studio-base/src/components/ExtensionsSettings/index.tsx index f0d05750cc3..24956e3b0d8 100644 --- a/packages/studio-base/src/components/ExtensionsSettings/index.tsx +++ b/packages/studio-base/src/components/ExtensionsSettings/index.tsx @@ -3,7 +3,6 @@ // file, You can obtain one at http://mozilla.org/MPL/2.0/ import Log from "@lichtblick/log"; -import { Immutable } from "@lichtblick/studio"; import { ExtensionDetails } from "@lichtblick/studio-base/components/ExtensionDetails"; import Stack from "@lichtblick/studio-base/components/Stack"; import { useExtensionCatalog } from "@lichtblick/studio-base/context/ExtensionCatalogContext"; @@ -11,6 +10,7 @@ import { ExtensionMarketplaceDetail, useExtensionMarketplace, } from "@lichtblick/studio-base/context/ExtensionMarketplaceContext"; +import { Immutable } from "@lichtblick/suite"; import { Alert, AlertTitle, diff --git a/packages/studio-base/src/components/MessagePathSyntax/filterMatches.ts b/packages/studio-base/src/components/MessagePathSyntax/filterMatches.ts index 983a411e1ad..bb36580c1b2 100644 --- a/packages/studio-base/src/components/MessagePathSyntax/filterMatches.ts +++ b/packages/studio-base/src/components/MessagePathSyntax/filterMatches.ts @@ -2,7 +2,7 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { Immutable } from "@lichtblick/studio"; +import { Immutable } from "@lichtblick/suite"; import { MessagePathFilter } from "@foxglove/message-path"; diff --git a/packages/studio-base/src/components/MessagePathSyntax/messagePathsForDatatype.ts b/packages/studio-base/src/components/MessagePathSyntax/messagePathsForDatatype.ts index 75ca2c61056..72c543974f4 100644 --- a/packages/studio-base/src/components/MessagePathSyntax/messagePathsForDatatype.ts +++ b/packages/studio-base/src/components/MessagePathSyntax/messagePathsForDatatype.ts @@ -11,11 +11,11 @@ // found at http://www.apache.org/licenses/LICENSE-2.0 // You may not use this file except in compliance with the License. -import { Immutable } from "@lichtblick/studio"; import { isTypicalFilterName } from "@lichtblick/studio-base/components/MessagePathSyntax/isTypicalFilterName"; import { RosDatatypes } from "@lichtblick/studio-base/types/RosDatatypes"; import { assertNever } from "@lichtblick/studio-base/util/assertNever"; import naturalSort from "@lichtblick/studio-base/util/naturalSort"; +import { Immutable } from "@lichtblick/suite"; import * as _ from "lodash-es"; import { diff --git a/packages/studio-base/src/components/MessagePathSyntax/simpleGetMessagePathDataItems.test.ts b/packages/studio-base/src/components/MessagePathSyntax/simpleGetMessagePathDataItems.test.ts index b86d2fb5c14..6958c752ac0 100644 --- a/packages/studio-base/src/components/MessagePathSyntax/simpleGetMessagePathDataItems.test.ts +++ b/packages/studio-base/src/components/MessagePathSyntax/simpleGetMessagePathDataItems.test.ts @@ -2,7 +2,7 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { MessageEvent } from "@lichtblick/studio"; +import { MessageEvent } from "@lichtblick/suite"; import { parseMessagePath } from "@foxglove/message-path"; diff --git a/packages/studio-base/src/components/MessagePathSyntax/simpleGetMessagePathDataItems.ts b/packages/studio-base/src/components/MessagePathSyntax/simpleGetMessagePathDataItems.ts index 9d0a1bd95f4..3076f096ea3 100644 --- a/packages/studio-base/src/components/MessagePathSyntax/simpleGetMessagePathDataItems.ts +++ b/packages/studio-base/src/components/MessagePathSyntax/simpleGetMessagePathDataItems.ts @@ -2,9 +2,9 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { Immutable } from "@lichtblick/studio"; import { MessageEvent } from "@lichtblick/studio-base/players/types"; import { isTypedArray } from "@lichtblick/studio-base/types/isTypedArray"; +import { Immutable } from "@lichtblick/suite"; import { MessagePath } from "@foxglove/message-path"; diff --git a/packages/studio-base/src/components/MessagePathSyntax/stringifyRosPath.ts b/packages/studio-base/src/components/MessagePathSyntax/stringifyRosPath.ts index 2b3cf286cb8..024d5f16872 100644 --- a/packages/studio-base/src/components/MessagePathSyntax/stringifyRosPath.ts +++ b/packages/studio-base/src/components/MessagePathSyntax/stringifyRosPath.ts @@ -2,7 +2,7 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { Immutable } from "@lichtblick/studio"; +import { Immutable } from "@lichtblick/suite"; import { MessagePathFilter, MessagePathPart, MessagePath } from "@foxglove/message-path"; diff --git a/packages/studio-base/src/components/MessagePathSyntax/useCachedGetMessagePathDataItems.ts b/packages/studio-base/src/components/MessagePathSyntax/useCachedGetMessagePathDataItems.ts index 3df8588a823..8bd8e61333e 100644 --- a/packages/studio-base/src/components/MessagePathSyntax/useCachedGetMessagePathDataItems.ts +++ b/packages/studio-base/src/components/MessagePathSyntax/useCachedGetMessagePathDataItems.ts @@ -13,7 +13,6 @@ import { filterMap } from "@lichtblick/den/collection"; import { useDeepMemo, useShallowMemo } from "@lichtblick/hooks"; -import { Immutable } from "@lichtblick/studio"; import * as PanelAPI from "@lichtblick/studio-base/PanelAPI"; import useGlobalVariables, { GlobalVariables, @@ -24,6 +23,7 @@ import { enumValuesByDatatypeAndField, extractTypeFromStudioEnumAnnotation, } from "@lichtblick/studio-base/util/enums"; +import { Immutable } from "@lichtblick/suite"; import * as _ from "lodash-es"; import { useCallback, useMemo } from "react"; diff --git a/packages/studio-base/src/components/MessagePipeline/FakePlayer.ts b/packages/studio-base/src/components/MessagePipeline/FakePlayer.ts index 5410671f4a7..a6e2fd75338 100644 --- a/packages/studio-base/src/components/MessagePipeline/FakePlayer.ts +++ b/packages/studio-base/src/components/MessagePipeline/FakePlayer.ts @@ -11,7 +11,6 @@ // found at http://www.apache.org/licenses/LICENSE-2.0 // You may not use this file except in compliance with the License. -import { Metadata, ParameterValue } from "@lichtblick/studio"; import { freezeMetadata } from "@lichtblick/studio-base/players/IterablePlayer/freezeMetadata"; import { PlayerCapabilities, @@ -22,6 +21,7 @@ import { AdvertiseOptions, PlayerPresence, } from "@lichtblick/studio-base/players/types"; +import { Metadata, ParameterValue } from "@lichtblick/suite"; export default class FakePlayer implements Player { #listener?: (arg0: PlayerState) => Promise; diff --git a/packages/studio-base/src/components/MessagePipeline/MockMessagePipelineProvider.tsx b/packages/studio-base/src/components/MessagePipeline/MockMessagePipelineProvider.tsx index 6ee2ad16a98..95d17dc249b 100644 --- a/packages/studio-base/src/components/MessagePipeline/MockMessagePipelineProvider.tsx +++ b/packages/studio-base/src/components/MessagePipeline/MockMessagePipelineProvider.tsx @@ -12,7 +12,6 @@ // You may not use this file except in compliance with the License. import { Condvar } from "@lichtblick/den/async"; -import { Metadata, ParameterValue } from "@lichtblick/studio"; import { FramePromise, pauseFrameForPromises, @@ -35,6 +34,7 @@ import { TopicStats, } from "@lichtblick/studio-base/players/types"; import { RosDatatypes } from "@lichtblick/studio-base/types/RosDatatypes"; +import { Metadata, ParameterValue } from "@lichtblick/suite"; import { Immutable } from "immer"; import * as _ from "lodash-es"; import { MutableRefObject, useEffect, useMemo, useRef, useState } from "react"; diff --git a/packages/studio-base/src/components/MessagePipeline/index.tsx b/packages/studio-base/src/components/MessagePipeline/index.tsx index 8470b9ce0ca..4d4f63dc0a4 100644 --- a/packages/studio-base/src/components/MessagePipeline/index.tsx +++ b/packages/studio-base/src/components/MessagePipeline/index.tsx @@ -3,7 +3,6 @@ // file, You can obtain one at http://mozilla.org/MPL/2.0/ import { useGuaranteedContext } from "@lichtblick/hooks"; -import { Immutable } from "@lichtblick/studio"; import { AppSetting } from "@lichtblick/studio-base/AppSetting"; import CurrentLayoutContext, { LayoutState, @@ -16,6 +15,7 @@ import { PlayerState, SubscribePayload, } from "@lichtblick/studio-base/players/types"; +import { Immutable } from "@lichtblick/suite"; import * as _ from "lodash-es"; import { createContext, diff --git a/packages/studio-base/src/components/MessagePipeline/store.ts b/packages/studio-base/src/components/MessagePipeline/store.ts index d1cdfa592a6..951a2243b22 100644 --- a/packages/studio-base/src/components/MessagePipeline/store.ts +++ b/packages/studio-base/src/components/MessagePipeline/store.ts @@ -3,7 +3,6 @@ // file, You can obtain one at http://mozilla.org/MPL/2.0/ import { Condvar } from "@lichtblick/den/async"; -import { Immutable, MessageEvent } from "@lichtblick/studio"; import { makeSubscriptionMemoizer, mergeSubscriptions, @@ -17,6 +16,7 @@ import { SubscribePayload, } from "@lichtblick/studio-base/players/types"; import isDesktopApp from "@lichtblick/studio-base/util/isDesktopApp"; +import { Immutable, MessageEvent } from "@lichtblick/suite"; import * as _ from "lodash-es"; import { MutableRefObject } from "react"; import shallowequal from "shallowequal"; diff --git a/packages/studio-base/src/components/MessagePipeline/subscriptions.ts b/packages/studio-base/src/components/MessagePipeline/subscriptions.ts index 97c44856a72..162fc489a6f 100644 --- a/packages/studio-base/src/components/MessagePipeline/subscriptions.ts +++ b/packages/studio-base/src/components/MessagePipeline/subscriptions.ts @@ -2,8 +2,8 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { Immutable } from "@lichtblick/studio"; import { SubscribePayload } from "@lichtblick/studio-base/players/types"; +import { Immutable } from "@lichtblick/suite"; import moize from "moize"; import * as R from "ramda"; diff --git a/packages/studio-base/src/components/MessagePipeline/types.ts b/packages/studio-base/src/components/MessagePipeline/types.ts index a8caa60fd1b..e90127d71da 100644 --- a/packages/studio-base/src/components/MessagePipeline/types.ts +++ b/packages/studio-base/src/components/MessagePipeline/types.ts @@ -2,7 +2,6 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { Immutable, MessageEvent, Metadata, ParameterValue } from "@lichtblick/studio"; import { BuiltinPanelExtensionContext } from "@lichtblick/studio-base/components/PanelExtensionAdapter"; import { AdvertiseOptions, @@ -12,6 +11,7 @@ import { Topic, } from "@lichtblick/studio-base/players/types"; import { RosDatatypes } from "@lichtblick/studio-base/types/RosDatatypes"; +import { Immutable, MessageEvent, Metadata, ParameterValue } from "@lichtblick/suite"; import { Time } from "@foxglove/rostime"; diff --git a/packages/studio-base/src/components/PanelContextMenu.tsx b/packages/studio-base/src/components/PanelContextMenu.tsx index 61bace8275d..3b601fbb121 100644 --- a/packages/studio-base/src/components/PanelContextMenu.tsx +++ b/packages/studio-base/src/components/PanelContextMenu.tsx @@ -2,8 +2,8 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { Immutable } from "@lichtblick/studio"; import { PANEL_ROOT_CLASS_NAME } from "@lichtblick/studio-base/components/PanelRoot"; +import { Immutable } from "@lichtblick/suite"; import { Divider, Menu, MenuItem } from "@mui/material"; import { useCallback, useEffect, useRef, useState } from "react"; diff --git a/packages/studio-base/src/components/PanelExtensionAdapter/PanelExtensionAdapter.stories.tsx b/packages/studio-base/src/components/PanelExtensionAdapter/PanelExtensionAdapter.stories.tsx index 1c183de749a..8d0483c4fca 100644 --- a/packages/studio-base/src/components/PanelExtensionAdapter/PanelExtensionAdapter.stories.tsx +++ b/packages/studio-base/src/components/PanelExtensionAdapter/PanelExtensionAdapter.stories.tsx @@ -2,16 +2,16 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ +import ErrorBoundary from "@lichtblick/studio-base/components/ErrorBoundary"; +import MockPanelContextProvider from "@lichtblick/studio-base/components/MockPanelContextProvider"; +import PanelSetup from "@lichtblick/studio-base/stories/PanelSetup"; import { Immutable, PanelExtensionContext, ParameterValue, RenderState, Time, -} from "@lichtblick/studio"; -import ErrorBoundary from "@lichtblick/studio-base/components/ErrorBoundary"; -import MockPanelContextProvider from "@lichtblick/studio-base/components/MockPanelContextProvider"; -import PanelSetup from "@lichtblick/studio-base/stories/PanelSetup"; +} from "@lichtblick/suite"; import { StoryObj } from "@storybook/react"; import { ReactElement, useLayoutEffect, useState } from "react"; import ReactDOM from "react-dom"; diff --git a/packages/studio-base/src/components/PanelExtensionAdapter/PanelExtensionAdapter.test.tsx b/packages/studio-base/src/components/PanelExtensionAdapter/PanelExtensionAdapter.test.tsx index a589047c19a..be5f008b374 100644 --- a/packages/studio-base/src/components/PanelExtensionAdapter/PanelExtensionAdapter.test.tsx +++ b/packages/studio-base/src/components/PanelExtensionAdapter/PanelExtensionAdapter.test.tsx @@ -7,11 +7,11 @@ /* eslint-disable jest/no-done-callback */ import { Condvar, signal } from "@lichtblick/den/async"; -import { PanelExtensionContext, RenderState, MessageEvent, Immutable } from "@lichtblick/studio"; import MockPanelContextProvider from "@lichtblick/studio-base/components/MockPanelContextProvider"; import { AdvertiseOptions, PlayerCapabilities } from "@lichtblick/studio-base/players/types"; import PanelSetup, { Fixture } from "@lichtblick/studio-base/stories/PanelSetup"; import ThemeProvider from "@lichtblick/studio-base/theme/ThemeProvider"; +import { PanelExtensionContext, RenderState, MessageEvent, Immutable } from "@lichtblick/suite"; import { render } from "@testing-library/react"; import { act } from "react-dom/test-utils"; diff --git a/packages/studio-base/src/components/PanelExtensionAdapter/PanelExtensionAdapter.tsx b/packages/studio-base/src/components/PanelExtensionAdapter/PanelExtensionAdapter.tsx index 8ffd80a4dd0..2393c4a507d 100644 --- a/packages/studio-base/src/components/PanelExtensionAdapter/PanelExtensionAdapter.tsx +++ b/packages/studio-base/src/components/PanelExtensionAdapter/PanelExtensionAdapter.tsx @@ -4,17 +4,6 @@ import { useSynchronousMountedState, useValueChangedDebugLog } from "@lichtblick/hooks"; import Logger from "@lichtblick/log"; -import { - AppSettingValue, - ExtensionPanelRegistration, - PanelExtensionContext, - ParameterValue, - RenderState, - SettingsTree, - Subscription, - Time, - VariableValue, -} from "@lichtblick/studio"; import { MessagePipelineContext, useMessagePipeline, @@ -45,6 +34,17 @@ import { } from "@lichtblick/studio-base/providers/PanelStateContextProvider"; import { PanelConfig, SaveConfig } from "@lichtblick/studio-base/types/panels"; import { assertNever } from "@lichtblick/studio-base/util/assertNever"; +import { + AppSettingValue, + ExtensionPanelRegistration, + PanelExtensionContext, + ParameterValue, + RenderState, + SettingsTree, + Subscription, + Time, + VariableValue, +} from "@lichtblick/suite"; import { useTheme } from "@mui/material"; import { CSSProperties, useEffect, useLayoutEffect, useMemo, useRef, useState } from "react"; import { useLatest } from "react-use"; diff --git a/packages/studio-base/src/components/PanelExtensionAdapter/messageProcessing.ts b/packages/studio-base/src/components/PanelExtensionAdapter/messageProcessing.ts index 2e89e24960a..7a22ae90c25 100644 --- a/packages/studio-base/src/components/PanelExtensionAdapter/messageProcessing.ts +++ b/packages/studio-base/src/components/PanelExtensionAdapter/messageProcessing.ts @@ -2,14 +2,14 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ +import { Topic as PlayerTopic } from "@lichtblick/studio-base/players/types"; +import { ExtensionNamespace } from "@lichtblick/studio-base/types/Extensions"; import { Immutable, MessageEvent, RegisterMessageConverterArgs, Subscription, -} from "@lichtblick/studio"; -import { Topic as PlayerTopic } from "@lichtblick/studio-base/players/types"; -import { ExtensionNamespace } from "@lichtblick/studio-base/types/Extensions"; +} from "@lichtblick/suite"; import * as _ from "lodash-es"; import { Opaque } from "ts-essentials"; diff --git a/packages/studio-base/src/components/PanelExtensionAdapter/renderState.ts b/packages/studio-base/src/components/PanelExtensionAdapter/renderState.ts index 8453e3a195d..616dd0183b4 100644 --- a/packages/studio-base/src/components/PanelExtensionAdapter/renderState.ts +++ b/packages/studio-base/src/components/PanelExtensionAdapter/renderState.ts @@ -3,16 +3,6 @@ // file, You can obtain one at http://mozilla.org/MPL/2.0/ import { filterMap } from "@lichtblick/den/collection"; -import { - AppSettingValue, - Immutable, - MessageEvent, - ParameterValue, - RegisterMessageConverterArgs, - RenderState, - Subscription, - Topic, -} from "@lichtblick/studio"; import { EMPTY_GLOBAL_VARIABLES, GlobalVariables, @@ -23,6 +13,16 @@ import { Topic as PlayerTopic, } from "@lichtblick/studio-base/players/types"; import { HoverValue } from "@lichtblick/studio-base/types/hoverValue"; +import { + AppSettingValue, + Immutable, + MessageEvent, + ParameterValue, + RegisterMessageConverterArgs, + RenderState, + Subscription, + Topic, +} from "@lichtblick/suite"; import memoizeWeak from "memoize-weak"; import { Writable } from "ts-essentials"; diff --git a/packages/studio-base/src/components/PanelExtensionAdapter/types.ts b/packages/studio-base/src/components/PanelExtensionAdapter/types.ts index dcc5c0009d9..fb05bbbca9a 100644 --- a/packages/studio-base/src/components/PanelExtensionAdapter/types.ts +++ b/packages/studio-base/src/components/PanelExtensionAdapter/types.ts @@ -2,7 +2,7 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { PanelExtensionContext } from "@lichtblick/studio"; +import { PanelExtensionContext } from "@lichtblick/suite"; /** * An asset loaded from Studio's asset manager. diff --git a/packages/studio-base/src/components/PanelExtensionAdapter/useSharedPanelState.ts b/packages/studio-base/src/components/PanelExtensionAdapter/useSharedPanelState.ts index a8d380debc0..3c655d294a4 100644 --- a/packages/studio-base/src/components/PanelExtensionAdapter/useSharedPanelState.ts +++ b/packages/studio-base/src/components/PanelExtensionAdapter/useSharedPanelState.ts @@ -2,7 +2,6 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { Immutable } from "@lichtblick/studio"; import { usePanelContext } from "@lichtblick/studio-base/components/PanelContext"; import { LayoutState, @@ -11,6 +10,7 @@ import { useCurrentLayoutSelector, } from "@lichtblick/studio-base/context/CurrentLayoutContext"; import { getPanelTypeFromId } from "@lichtblick/studio-base/util/layout"; +import { Immutable } from "@lichtblick/suite"; import { useCallback, useMemo } from "react"; const EmptySharedPanelState: Record = Object.freeze({}); diff --git a/packages/studio-base/src/components/PanelSettings/index.stories.tsx b/packages/studio-base/src/components/PanelSettings/index.stories.tsx index 580ea1352e8..787fe71b59c 100644 --- a/packages/studio-base/src/components/PanelSettings/index.stories.tsx +++ b/packages/studio-base/src/components/PanelSettings/index.stories.tsx @@ -11,10 +11,10 @@ // found at http://www.apache.org/licenses/LICENSE-2.0 // You may not use this file except in compliance with the License. -import { SettingsTreeNodes } from "@lichtblick/studio"; import { PanelCatalog, PanelInfo } from "@lichtblick/studio-base/context/PanelCatalogContext"; import MockCurrentLayoutProvider from "@lichtblick/studio-base/providers/CurrentLayoutProvider/MockCurrentLayoutProvider"; import PanelSetup from "@lichtblick/studio-base/stories/PanelSetup"; +import { SettingsTreeNodes } from "@lichtblick/suite"; import { StoryFn, StoryObj } from "@storybook/react"; import { DndProvider } from "react-dnd"; import { HTML5Backend } from "react-dnd-html5-backend"; diff --git a/packages/studio-base/src/components/PanelSettings/index.tsx b/packages/studio-base/src/components/PanelSettings/index.tsx index 7dfa172e3a6..72933509c24 100644 --- a/packages/studio-base/src/components/PanelSettings/index.tsx +++ b/packages/studio-base/src/components/PanelSettings/index.tsx @@ -2,7 +2,6 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { SettingsTree } from "@lichtblick/studio"; import { AppSetting } from "@lichtblick/studio-base/AppSetting"; import { useConfigById } from "@lichtblick/studio-base/PanelAPI"; import EmptyState from "@lichtblick/studio-base/components/EmptyState"; @@ -26,6 +25,7 @@ import { useAppConfigurationValue } from "@lichtblick/studio-base/hooks"; import { PanelConfig } from "@lichtblick/studio-base/types/panels"; import { TAB_PANEL_TYPE } from "@lichtblick/studio-base/util/globalConstants"; import { getPanelTypeFromId } from "@lichtblick/studio-base/util/layout"; +import { SettingsTree } from "@lichtblick/suite"; import { Divider, Typography } from "@mui/material"; import { useCallback, useEffect, useMemo, useState } from "react"; import { useTranslation } from "react-i18next"; diff --git a/packages/studio-base/src/components/PlaybackControls/ProgressPlot.tsx b/packages/studio-base/src/components/PlaybackControls/ProgressPlot.tsx index 01d20e1a683..b2568bed2fe 100644 --- a/packages/studio-base/src/components/PlaybackControls/ProgressPlot.tsx +++ b/packages/studio-base/src/components/PlaybackControls/ProgressPlot.tsx @@ -4,9 +4,9 @@ import { keyframes } from "@emotion/react"; import { filterMap } from "@lichtblick/den/collection"; -import { Immutable } from "@lichtblick/studio"; import Stack from "@lichtblick/studio-base/components/Stack"; import { Range } from "@lichtblick/studio-base/util/ranges"; +import { Immutable } from "@lichtblick/suite"; import { simplify } from "intervals-fn"; import * as _ from "lodash-es"; import { useMemo } from "react"; diff --git a/packages/studio-base/src/components/PlayerManager.tsx b/packages/studio-base/src/components/PlayerManager.tsx index 5eba4df7a85..64afe0277ba 100644 --- a/packages/studio-base/src/components/PlayerManager.tsx +++ b/packages/studio-base/src/components/PlayerManager.tsx @@ -13,7 +13,6 @@ import { useWarnImmediateReRender } from "@lichtblick/hooks"; import Logger from "@lichtblick/log"; -import { Immutable } from "@lichtblick/studio"; import { MessagePipelineProvider } from "@lichtblick/studio-base/components/MessagePipeline"; import { useAnalytics } from "@lichtblick/studio-base/context/AnalyticsContext"; import { @@ -43,6 +42,7 @@ import { import UserScriptPlayer from "@lichtblick/studio-base/players/UserScriptPlayer"; import { Player } from "@lichtblick/studio-base/players/types"; import { UserScripts } from "@lichtblick/studio-base/types/panels"; +import { Immutable } from "@lichtblick/suite"; import { useSnackbar } from "notistack"; import { PropsWithChildren, diff --git a/packages/studio-base/src/components/SettingsTreeEditor/FieldEditor.tsx b/packages/studio-base/src/components/SettingsTreeEditor/FieldEditor.tsx index 0bda59b444b..4e61d3776ae 100644 --- a/packages/studio-base/src/components/SettingsTreeEditor/FieldEditor.tsx +++ b/packages/studio-base/src/components/SettingsTreeEditor/FieldEditor.tsx @@ -2,10 +2,10 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { Immutable, SettingsTreeAction, SettingsTreeField } from "@lichtblick/studio"; import MessagePathInput from "@lichtblick/studio-base/components/MessagePathSyntax/MessagePathInput"; import Stack from "@lichtblick/studio-base/components/Stack"; import { useAppContext } from "@lichtblick/studio-base/context/AppContext"; +import { Immutable, SettingsTreeAction, SettingsTreeField } from "@lichtblick/suite"; import CancelIcon from "@mui/icons-material/Cancel"; import ErrorIcon from "@mui/icons-material/Error"; import { diff --git a/packages/studio-base/src/components/SettingsTreeEditor/NodeActionsMenu.tsx b/packages/studio-base/src/components/SettingsTreeEditor/NodeActionsMenu.tsx index 10a61404c8c..4b4966f7447 100644 --- a/packages/studio-base/src/components/SettingsTreeEditor/NodeActionsMenu.tsx +++ b/packages/studio-base/src/components/SettingsTreeEditor/NodeActionsMenu.tsx @@ -2,7 +2,7 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { SettingsTreeNodeAction } from "@lichtblick/studio"; +import { SettingsTreeNodeAction } from "@lichtblick/suite"; import MoreVertIcon from "@mui/icons-material/MoreVert"; import { Menu, MenuItem, IconButton, ListItemIcon, ListItemText, Divider } from "@mui/material"; import { useState } from "react"; diff --git a/packages/studio-base/src/components/SettingsTreeEditor/NodeEditor.tsx b/packages/studio-base/src/components/SettingsTreeEditor/NodeEditor.tsx index a37b945ee57..2864e544545 100644 --- a/packages/studio-base/src/components/SettingsTreeEditor/NodeEditor.tsx +++ b/packages/studio-base/src/components/SettingsTreeEditor/NodeEditor.tsx @@ -3,15 +3,15 @@ // file, You can obtain one at http://mozilla.org/MPL/2.0/ import { filterMap } from "@lichtblick/den/collection"; +import { HighlightedText } from "@lichtblick/studio-base/components/HighlightedText"; +import Stack from "@lichtblick/studio-base/components/Stack"; +import { useAppContext } from "@lichtblick/studio-base/context/AppContext"; import { Immutable, SettingsTreeAction, SettingsTreeNode, SettingsTreeNodeActionItem, -} from "@lichtblick/studio"; -import { HighlightedText } from "@lichtblick/studio-base/components/HighlightedText"; -import Stack from "@lichtblick/studio-base/components/Stack"; -import { useAppContext } from "@lichtblick/studio-base/context/AppContext"; +} from "@lichtblick/suite"; import ArrowDownIcon from "@mui/icons-material/ArrowDropDown"; import ArrowRightIcon from "@mui/icons-material/ArrowRight"; import CheckIcon from "@mui/icons-material/Check"; diff --git a/packages/studio-base/src/components/SettingsTreeEditor/icons.ts b/packages/studio-base/src/components/SettingsTreeEditor/icons.ts index 8a2f7729dd2..efcb0244a14 100644 --- a/packages/studio-base/src/components/SettingsTreeEditor/icons.ts +++ b/packages/studio-base/src/components/SettingsTreeEditor/icons.ts @@ -2,7 +2,7 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { SettingsIcon } from "@lichtblick/studio"; +import { SettingsIcon } from "@lichtblick/suite"; import Clock from "@mui/icons-material/AccessTime"; import Add from "@mui/icons-material/Add"; import Addchart from "@mui/icons-material/Addchart"; diff --git a/packages/studio-base/src/components/SettingsTreeEditor/index.stories.tsx b/packages/studio-base/src/components/SettingsTreeEditor/index.stories.tsx index f7c0e5e333a..15dc3b7ddc5 100644 --- a/packages/studio-base/src/components/SettingsTreeEditor/index.stories.tsx +++ b/packages/studio-base/src/components/SettingsTreeEditor/index.stories.tsx @@ -3,16 +3,16 @@ // file, You can obtain one at http://mozilla.org/MPL/2.0/ import Logger from "@lichtblick/log"; +import { MessagePathInputStoryFixture } from "@lichtblick/studio-base/components/MessagePathSyntax/fixture"; +import SettingsTreeEditor from "@lichtblick/studio-base/components/SettingsTreeEditor"; +import Stack from "@lichtblick/studio-base/components/Stack"; +import PanelSetup from "@lichtblick/studio-base/stories/PanelSetup"; import { SettingsTreeNode, SettingsTreeNodes, SettingsTreeFieldValue, SettingsTreeAction, -} from "@lichtblick/studio"; -import { MessagePathInputStoryFixture } from "@lichtblick/studio-base/components/MessagePathSyntax/fixture"; -import SettingsTreeEditor from "@lichtblick/studio-base/components/SettingsTreeEditor"; -import Stack from "@lichtblick/studio-base/components/Stack"; -import PanelSetup from "@lichtblick/studio-base/stories/PanelSetup"; +} from "@lichtblick/suite"; import { useTheme } from "@mui/material"; import { StoryObj } from "@storybook/react"; import { userEvent, within } from "@storybook/testing-library"; diff --git a/packages/studio-base/src/components/SettingsTreeEditor/index.tsx b/packages/studio-base/src/components/SettingsTreeEditor/index.tsx index e372551411a..647ee63ece8 100644 --- a/packages/studio-base/src/components/SettingsTreeEditor/index.tsx +++ b/packages/studio-base/src/components/SettingsTreeEditor/index.tsx @@ -2,7 +2,6 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { Immutable, SettingsTree, SettingsTreeAction, SettingsTreeField } from "@lichtblick/studio"; import { useConfigById } from "@lichtblick/studio-base/PanelAPI"; import { FieldEditor } from "@lichtblick/studio-base/components/SettingsTreeEditor/FieldEditor"; import Stack from "@lichtblick/studio-base/components/Stack"; @@ -10,6 +9,7 @@ import { useSelectedPanels } from "@lichtblick/studio-base/context/CurrentLayout import { usePanelCatalog } from "@lichtblick/studio-base/context/PanelCatalogContext"; import { usePanelStateStore } from "@lichtblick/studio-base/context/PanelStateContext"; import { PANEL_TITLE_CONFIG_KEY, getPanelTypeFromId } from "@lichtblick/studio-base/util/layout"; +import { Immutable, SettingsTree, SettingsTreeAction, SettingsTreeField } from "@lichtblick/suite"; import CancelIcon from "@mui/icons-material/Cancel"; import SearchIcon from "@mui/icons-material/Search"; import { IconButton, TextField } from "@mui/material"; diff --git a/packages/studio-base/src/components/SettingsTreeEditor/utils.ts b/packages/studio-base/src/components/SettingsTreeEditor/utils.ts index 7dc10716f8d..6d9f71b5904 100644 --- a/packages/studio-base/src/components/SettingsTreeEditor/utils.ts +++ b/packages/studio-base/src/components/SettingsTreeEditor/utils.ts @@ -2,7 +2,7 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { Immutable, SettingsTreeNode, SettingsTreeNodes } from "@lichtblick/studio"; +import { Immutable, SettingsTreeNode, SettingsTreeNodes } from "@lichtblick/suite"; import * as _ from "lodash-es"; /** diff --git a/packages/studio-base/src/components/Sparkline.tsx b/packages/studio-base/src/components/Sparkline.tsx index 16839a3f357..e471d9a79a9 100644 --- a/packages/studio-base/src/components/Sparkline.tsx +++ b/packages/studio-base/src/components/Sparkline.tsx @@ -11,8 +11,8 @@ // found at http://www.apache.org/licenses/LICENSE-2.0 // You may not use this file except in compliance with the License. -import { Immutable } from "@lichtblick/studio"; import AutoSizingCanvas from "@lichtblick/studio-base/components/AutoSizingCanvas"; +import { Immutable } from "@lichtblick/suite"; import { useCallback } from "react"; import { makeStyles } from "tss-react/mui"; diff --git a/packages/studio-base/src/components/StudioLogsSettings/useStudioLogsSettingsTree.ts b/packages/studio-base/src/components/StudioLogsSettings/useStudioLogsSettingsTree.ts index c3a3c3d4af2..53eb445adb2 100644 --- a/packages/studio-base/src/components/StudioLogsSettings/useStudioLogsSettingsTree.ts +++ b/packages/studio-base/src/components/StudioLogsSettings/useStudioLogsSettingsTree.ts @@ -3,8 +3,8 @@ // file, You can obtain one at http://mozilla.org/MPL/2.0/ import Log, { toLogLevel } from "@lichtblick/log"; -import { SettingsTree, SettingsTreeNode, SettingsTreeNodes } from "@lichtblick/studio"; import { useStudioLogsSettings } from "@lichtblick/studio-base/context/StudioLogsSettingsContext"; +import { SettingsTree, SettingsTreeNode, SettingsTreeNodes } from "@lichtblick/suite"; import { extname } from "path"; import { useMemo } from "react"; diff --git a/packages/studio-base/src/components/TimeBasedChart/TimeBasedChartTooltipContent.tsx b/packages/studio-base/src/components/TimeBasedChart/TimeBasedChartTooltipContent.tsx index 312f55ee322..d4793f3d1c8 100644 --- a/packages/studio-base/src/components/TimeBasedChart/TimeBasedChartTooltipContent.tsx +++ b/packages/studio-base/src/components/TimeBasedChart/TimeBasedChartTooltipContent.tsx @@ -12,8 +12,8 @@ // You may not use this file except in compliance with the License. import { Square12Filled } from "@fluentui/react-icons"; -import { Immutable } from "@lichtblick/studio"; import Stack from "@lichtblick/studio-base/components/Stack"; +import { Immutable } from "@lichtblick/suite"; import * as _ from "lodash-es"; import { Fragment, PropsWithChildren, useMemo } from "react"; import { makeStyles } from "tss-react/mui"; diff --git a/packages/studio-base/src/components/TimeBasedChart/downsampleStates.ts b/packages/studio-base/src/components/TimeBasedChart/downsampleStates.ts index 81a453dd16f..87da68f62b7 100644 --- a/packages/studio-base/src/components/TimeBasedChart/downsampleStates.ts +++ b/packages/studio-base/src/components/TimeBasedChart/downsampleStates.ts @@ -2,8 +2,8 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { Immutable } from "@lichtblick/studio"; import { Point } from "@lichtblick/studio-base/components/Chart/datasets"; +import { Immutable } from "@lichtblick/suite"; import * as R from "ramda"; import { calculateIntervals } from "./downsample"; diff --git a/packages/studio-base/src/components/TopicList/getMessagePathSearchItems.ts b/packages/studio-base/src/components/TopicList/getMessagePathSearchItems.ts index 08314571e5d..2a83c9d9042 100644 --- a/packages/studio-base/src/components/TopicList/getMessagePathSearchItems.ts +++ b/packages/studio-base/src/components/TopicList/getMessagePathSearchItems.ts @@ -2,7 +2,7 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { Immutable } from "@lichtblick/studio"; +import { Immutable } from "@lichtblick/suite"; import * as _ from "lodash-es"; import { MessageDefinition } from "@foxglove/message-definition"; diff --git a/packages/studio-base/src/components/TopicList/useTopicListSearch.ts b/packages/studio-base/src/components/TopicList/useTopicListSearch.ts index 6d44d5407a3..939c61383a0 100644 --- a/packages/studio-base/src/components/TopicList/useTopicListSearch.ts +++ b/packages/studio-base/src/components/TopicList/useTopicListSearch.ts @@ -2,8 +2,8 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { Immutable } from "@lichtblick/studio"; import { Topic } from "@lichtblick/studio-base/players/types"; +import { Immutable } from "@lichtblick/suite"; import { Fzf, FzfResultItem, basicMatch } from "fzf"; import * as _ from "lodash-es"; import { useMemo } from "react"; diff --git a/packages/studio-base/src/components/VariablesList/Variable.tsx b/packages/studio-base/src/components/VariablesList/Variable.tsx index 31a1babe169..c143ab276a5 100644 --- a/packages/studio-base/src/components/VariablesList/Variable.tsx +++ b/packages/studio-base/src/components/VariablesList/Variable.tsx @@ -2,7 +2,6 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { VariableValue } from "@lichtblick/studio"; import CopyButton from "@lichtblick/studio-base/components/CopyButton"; import JsonInput from "@lichtblick/studio-base/components/JsonInput"; import Stack from "@lichtblick/studio-base/components/Stack"; @@ -11,6 +10,7 @@ import useGlobalVariables, { GlobalVariables, } from "@lichtblick/studio-base/hooks/useGlobalVariables"; import { AppEvent } from "@lichtblick/studio-base/services/IAnalytics"; +import { VariableValue } from "@lichtblick/suite"; import ArrowDropDownIcon from "@mui/icons-material/ArrowDropDown"; import ErrorIcon from "@mui/icons-material/Error"; import MoreVertIcon from "@mui/icons-material/MoreVert"; diff --git a/packages/studio-base/src/components/WssErrorModal.tsx b/packages/studio-base/src/components/WssErrorModal.tsx index 7bfa4e5fa2b..b0655b50400 100644 --- a/packages/studio-base/src/components/WssErrorModal.tsx +++ b/packages/studio-base/src/components/WssErrorModal.tsx @@ -2,8 +2,8 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { Immutable } from "@lichtblick/studio"; import { PlayerProblem } from "@lichtblick/studio-base/players/types"; +import { Immutable } from "@lichtblick/suite"; import CloseIcon from "@mui/icons-material/Close"; import { Dialog, DialogContent, DialogTitle, IconButton, Stack, Typography } from "@mui/material"; import { useState } from "react"; diff --git a/packages/studio-base/src/context/AppContext.ts b/packages/studio-base/src/context/AppContext.ts index 39d48a26346..d29e28d6107 100644 --- a/packages/studio-base/src/context/AppContext.ts +++ b/packages/studio-base/src/context/AppContext.ts @@ -2,12 +2,12 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { Immutable, SettingsTreeField, SettingsTreeNode } from "@lichtblick/studio"; import { AppBarMenuItem } from "@lichtblick/studio-base/components/AppBar/types"; import { LayoutData } from "@lichtblick/studio-base/context/CurrentLayoutContext"; import { WorkspaceContextStore } from "@lichtblick/studio-base/context/Workspace/WorkspaceContext"; import type { SceneExtensionConfig } from "@lichtblick/studio-base/panels/ThreeDeeRender/SceneExtensionConfig"; import type { Player } from "@lichtblick/studio-base/players/types"; +import { Immutable, SettingsTreeField, SettingsTreeNode } from "@lichtblick/suite"; import { createContext, useContext } from "react"; import { DeepPartial } from "ts-essentials"; import { StoreApi } from "zustand"; diff --git a/packages/studio-base/src/context/CurrentLayoutContext/actions.ts b/packages/studio-base/src/context/CurrentLayoutContext/actions.ts index 7d91d3c4510..2034c1d02ca 100644 --- a/packages/studio-base/src/context/CurrentLayoutContext/actions.ts +++ b/packages/studio-base/src/context/CurrentLayoutContext/actions.ts @@ -11,7 +11,6 @@ // found at http://www.apache.org/licenses/LICENSE-2.0 // You may not use this file except in compliance with the License. -import { VariableValue } from "@lichtblick/studio"; import { GlobalVariables } from "@lichtblick/studio-base/hooks/useGlobalVariables"; import { TabLocation } from "@lichtblick/studio-base/types/layouts"; import { @@ -21,6 +20,7 @@ import { SavedProps, UserScripts, } from "@lichtblick/studio-base/types/panels"; +import { VariableValue } from "@lichtblick/suite"; import { MosaicNode, MosaicPath } from "react-mosaic-component"; export type LayoutData = { diff --git a/packages/studio-base/src/context/CurrentLayoutContext/index.ts b/packages/studio-base/src/context/CurrentLayoutContext/index.ts index a753f09aa49..2b4cd29845a 100644 --- a/packages/studio-base/src/context/CurrentLayoutContext/index.ts +++ b/packages/studio-base/src/context/CurrentLayoutContext/index.ts @@ -8,10 +8,10 @@ import { useShallowMemo, } from "@lichtblick/hooks"; import Logger from "@lichtblick/log"; -import { RenderState, VariableValue } from "@lichtblick/studio"; import useShouldNotChangeOften from "@lichtblick/studio-base/hooks/useShouldNotChangeOften"; import toggleSelectedPanel from "@lichtblick/studio-base/providers/CurrentLayoutProvider/toggleSelectedPanel"; import { PanelConfig, PlaybackConfig, UserScripts } from "@lichtblick/studio-base/types/panels"; +import { RenderState, VariableValue } from "@lichtblick/suite"; import { createContext, useCallback, useLayoutEffect, useReducer, useRef, useState } from "react"; import { getLeaves } from "react-mosaic-component"; diff --git a/packages/studio-base/src/context/EventsContext.ts b/packages/studio-base/src/context/EventsContext.ts index 9bc93193b7b..754292a68a5 100644 --- a/packages/studio-base/src/context/EventsContext.ts +++ b/packages/studio-base/src/context/EventsContext.ts @@ -3,7 +3,7 @@ // file, You can obtain one at http://mozilla.org/MPL/2.0/ import { useGuaranteedContext } from "@lichtblick/hooks"; -import { Immutable } from "@lichtblick/studio"; +import { Immutable } from "@lichtblick/suite"; import { createContext } from "react"; import { AsyncState } from "react-use/lib/useAsyncFn"; import { StoreApi, useStore } from "zustand"; diff --git a/packages/studio-base/src/context/ExtensionCatalogContext.ts b/packages/studio-base/src/context/ExtensionCatalogContext.ts index d9bc979c9c1..cc483854aa0 100644 --- a/packages/studio-base/src/context/ExtensionCatalogContext.ts +++ b/packages/studio-base/src/context/ExtensionCatalogContext.ts @@ -3,13 +3,13 @@ // file, You can obtain one at http://mozilla.org/MPL/2.0/ import { useGuaranteedContext } from "@lichtblick/hooks"; +import { TopicAliasFunctions } from "@lichtblick/studio-base/players/TopicAliasingPlayer/TopicAliasingPlayer"; +import { ExtensionInfo, ExtensionNamespace } from "@lichtblick/studio-base/types/Extensions"; import { ExtensionPanelRegistration, Immutable, RegisterMessageConverterArgs, -} from "@lichtblick/studio"; -import { TopicAliasFunctions } from "@lichtblick/studio-base/players/TopicAliasingPlayer/TopicAliasingPlayer"; -import { ExtensionInfo, ExtensionNamespace } from "@lichtblick/studio-base/types/Extensions"; +} from "@lichtblick/suite"; import { createContext } from "react"; import { StoreApi, useStore } from "zustand"; diff --git a/packages/studio-base/src/context/PanelStateContext.ts b/packages/studio-base/src/context/PanelStateContext.ts index e7e0822b5a7..92fe17aadd1 100644 --- a/packages/studio-base/src/context/PanelStateContext.ts +++ b/packages/studio-base/src/context/PanelStateContext.ts @@ -3,7 +3,7 @@ // file, You can obtain one at http://mozilla.org/MPL/2.0/ import { useGuaranteedContext } from "@lichtblick/hooks"; -import { Immutable, SettingsTree } from "@lichtblick/studio"; +import { Immutable, SettingsTree } from "@lichtblick/suite"; import { createContext } from "react"; import { StoreApi, useStore } from "zustand"; diff --git a/packages/studio-base/src/context/ProblemsContext.ts b/packages/studio-base/src/context/ProblemsContext.ts index f4701a99977..e5140cb11df 100644 --- a/packages/studio-base/src/context/ProblemsContext.ts +++ b/packages/studio-base/src/context/ProblemsContext.ts @@ -3,8 +3,8 @@ // file, You can obtain one at http://mozilla.org/MPL/2.0/ import { useGuaranteedContext } from "@lichtblick/hooks"; -import { Immutable } from "@lichtblick/studio"; import { PlayerProblem } from "@lichtblick/studio-base/players/types"; +import { Immutable } from "@lichtblick/suite"; import { createContext } from "react"; import { StoreApi, useStore } from "zustand"; diff --git a/packages/studio-base/src/context/TimelineInteractionStateContext.tsx b/packages/studio-base/src/context/TimelineInteractionStateContext.tsx index 64a1f61b9bc..a428ae23848 100644 --- a/packages/studio-base/src/context/TimelineInteractionStateContext.tsx +++ b/packages/studio-base/src/context/TimelineInteractionStateContext.tsx @@ -12,9 +12,9 @@ // You may not use this file except in compliance with the License. import { useGuaranteedContext } from "@lichtblick/hooks"; -import { Immutable } from "@lichtblick/studio"; import { TimelinePositionedEvent } from "@lichtblick/studio-base/context/EventsContext"; import type { HoverValue } from "@lichtblick/studio-base/types/hoverValue"; +import { Immutable } from "@lichtblick/suite"; import { createContext, useCallback } from "react"; import { StoreApi, useStore } from "zustand"; diff --git a/packages/studio-base/src/hooks/useAppTimeFormat.ts b/packages/studio-base/src/hooks/useAppTimeFormat.ts index c62e6c2b987..540e1038224 100644 --- a/packages/studio-base/src/hooks/useAppTimeFormat.ts +++ b/packages/studio-base/src/hooks/useAppTimeFormat.ts @@ -2,11 +2,11 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { Time } from "@lichtblick/studio"; import { AppSetting } from "@lichtblick/studio-base/AppSetting"; import { TimeDisplayMethod } from "@lichtblick/studio-base/types/panels"; import { formatDate, formatTime } from "@lichtblick/studio-base/util/formatTime"; import { formatTimeRaw } from "@lichtblick/studio-base/util/time"; +import { Time } from "@lichtblick/suite"; import moment from "moment-timezone"; import { useCallback, useMemo } from "react"; diff --git a/packages/studio-base/src/hooks/useGlobalVariables.ts b/packages/studio-base/src/hooks/useGlobalVariables.ts index d01b521dea2..7ac56af8cd6 100644 --- a/packages/studio-base/src/hooks/useGlobalVariables.ts +++ b/packages/studio-base/src/hooks/useGlobalVariables.ts @@ -11,12 +11,12 @@ // found at http://www.apache.org/licenses/LICENSE-2.0 // You may not use this file except in compliance with the License. -import type { VariableValue } from "@lichtblick/studio"; import { LayoutState, useCurrentLayoutActions, useCurrentLayoutSelector, } from "@lichtblick/studio-base/context/CurrentLayoutContext"; +import type { VariableValue } from "@lichtblick/suite"; export type GlobalVariables = { [key: string]: VariableValue }; diff --git a/packages/studio-base/src/hooks/usePublisher.tsx b/packages/studio-base/src/hooks/usePublisher.tsx index 6d9c4a99688..6817fa7f0b5 100644 --- a/packages/studio-base/src/hooks/usePublisher.tsx +++ b/packages/studio-base/src/hooks/usePublisher.tsx @@ -11,10 +11,10 @@ // found at http://www.apache.org/licenses/LICENSE-2.0 // You may not use this file except in compliance with the License. -import { Immutable } from "@lichtblick/studio"; import { useMessagePipeline } from "@lichtblick/studio-base/components/MessagePipeline"; import { PlayerCapabilities } from "@lichtblick/studio-base/players/types"; import { RosDatatypes } from "@lichtblick/studio-base/types/RosDatatypes"; +import { Immutable } from "@lichtblick/suite"; import { useCallback, useEffect, useState } from "react"; import { v4 as uuidv4 } from "uuid"; diff --git a/packages/studio-base/src/hooks/useTopicPublishFrequences.ts b/packages/studio-base/src/hooks/useTopicPublishFrequences.ts index c8685ab92bd..a44678d1f93 100644 --- a/packages/studio-base/src/hooks/useTopicPublishFrequences.ts +++ b/packages/studio-base/src/hooks/useTopicPublishFrequences.ts @@ -2,12 +2,12 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { Immutable } from "@lichtblick/studio"; import { MessagePipelineContext, useMessagePipeline, } from "@lichtblick/studio-base/components/MessagePipeline"; import { PlayerCapabilities, TopicStats } from "@lichtblick/studio-base/players/types"; +import { Immutable } from "@lichtblick/suite"; import { useMemo, useRef } from "react"; import { subtract as subtractTimes, areEqual, fromMillis, Time, toSec } from "@foxglove/rostime"; diff --git a/packages/studio-base/src/panels/CallService/CallService.tsx b/packages/studio-base/src/panels/CallService/CallService.tsx index e14588cfe22..1b5f5515a13 100644 --- a/packages/studio-base/src/panels/CallService/CallService.tsx +++ b/packages/studio-base/src/panels/CallService/CallService.tsx @@ -3,10 +3,10 @@ // file, You can obtain one at http://mozilla.org/MPL/2.0/ import Log from "@lichtblick/log"; -import { PanelExtensionContext, SettingsTreeAction } from "@lichtblick/studio"; import Stack from "@lichtblick/studio-base/components/Stack"; import { Config } from "@lichtblick/studio-base/panels/CallService/types"; import ThemeProvider from "@lichtblick/studio-base/theme/ThemeProvider"; +import { PanelExtensionContext, SettingsTreeAction } from "@lichtblick/suite"; import { Button, Palette, TextField, Tooltip, Typography, inputBaseClasses } from "@mui/material"; import { Dispatch, SetStateAction, useCallback, useEffect, useMemo, useState } from "react"; import { makeStyles } from "tss-react/mui"; diff --git a/packages/studio-base/src/panels/CallService/index.tsx b/packages/studio-base/src/panels/CallService/index.tsx index 92f1f86e554..5009b5fc270 100644 --- a/packages/studio-base/src/panels/CallService/index.tsx +++ b/packages/studio-base/src/panels/CallService/index.tsx @@ -3,12 +3,12 @@ // file, You can obtain one at http://mozilla.org/MPL/2.0/ import { useCrash } from "@lichtblick/hooks"; -import { PanelExtensionContext } from "@lichtblick/studio"; import { CaptureErrorBoundary } from "@lichtblick/studio-base/components/CaptureErrorBoundary"; import Panel from "@lichtblick/studio-base/components/Panel"; import { PanelExtensionAdapter } from "@lichtblick/studio-base/components/PanelExtensionAdapter"; import { createSyncRoot } from "@lichtblick/studio-base/panels/createSyncRoot"; import { SaveConfig } from "@lichtblick/studio-base/types/panels"; +import { PanelExtensionContext } from "@lichtblick/suite"; import { StrictMode, useMemo } from "react"; import { CallService } from "./CallService"; diff --git a/packages/studio-base/src/panels/CallService/settings.ts b/packages/studio-base/src/panels/CallService/settings.ts index 6b5bd0a8f0b..da5fd591565 100644 --- a/packages/studio-base/src/panels/CallService/settings.ts +++ b/packages/studio-base/src/panels/CallService/settings.ts @@ -3,7 +3,7 @@ // file, You can obtain one at http://mozilla.org/MPL/2.0/ import { useShallowMemo } from "@lichtblick/hooks"; -import { SettingsTreeAction, SettingsTreeNodes } from "@lichtblick/studio"; +import { SettingsTreeAction, SettingsTreeNodes } from "@lichtblick/suite"; import { produce } from "immer"; import * as _ from "lodash-es"; import { useMemo } from "react"; diff --git a/packages/studio-base/src/panels/Gauge/Gauge.tsx b/packages/studio-base/src/panels/Gauge/Gauge.tsx index 36b577c731b..325efa480bb 100644 --- a/packages/studio-base/src/panels/Gauge/Gauge.tsx +++ b/packages/studio-base/src/panels/Gauge/Gauge.tsx @@ -2,9 +2,9 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { MessageEvent, PanelExtensionContext, SettingsTreeAction } from "@lichtblick/studio"; import { simpleGetMessagePathDataItems } from "@lichtblick/studio-base/components/MessagePathSyntax/simpleGetMessagePathDataItems"; import { turboColorString } from "@lichtblick/studio-base/util/colorUtils"; +import { MessageEvent, PanelExtensionContext, SettingsTreeAction } from "@lichtblick/suite"; import * as _ from "lodash-es"; import { useCallback, useEffect, useLayoutEffect, useReducer, useState } from "react"; import { v4 as uuidv4 } from "uuid"; diff --git a/packages/studio-base/src/panels/Gauge/index.tsx b/packages/studio-base/src/panels/Gauge/index.tsx index 966c6e027b0..5d60612e11e 100644 --- a/packages/studio-base/src/panels/Gauge/index.tsx +++ b/packages/studio-base/src/panels/Gauge/index.tsx @@ -3,13 +3,13 @@ // file, You can obtain one at http://mozilla.org/MPL/2.0/ import { useCrash } from "@lichtblick/hooks"; -import { PanelExtensionContext } from "@lichtblick/studio"; import { CaptureErrorBoundary } from "@lichtblick/studio-base/components/CaptureErrorBoundary"; import Panel from "@lichtblick/studio-base/components/Panel"; import { PanelExtensionAdapter } from "@lichtblick/studio-base/components/PanelExtensionAdapter"; import { createSyncRoot } from "@lichtblick/studio-base/panels/createSyncRoot"; import ThemeProvider from "@lichtblick/studio-base/theme/ThemeProvider"; import { SaveConfig } from "@lichtblick/studio-base/types/panels"; +import { PanelExtensionContext } from "@lichtblick/suite"; import { StrictMode, useMemo } from "react"; import { Gauge } from "./Gauge"; diff --git a/packages/studio-base/src/panels/Gauge/settings.ts b/packages/studio-base/src/panels/Gauge/settings.ts index 49779de116f..797f5bb973d 100644 --- a/packages/studio-base/src/panels/Gauge/settings.ts +++ b/packages/studio-base/src/panels/Gauge/settings.ts @@ -3,7 +3,7 @@ // file, You can obtain one at http://mozilla.org/MPL/2.0/ import { useShallowMemo } from "@lichtblick/hooks"; -import { SettingsTreeAction, SettingsTreeNode, SettingsTreeNodes } from "@lichtblick/studio"; +import { SettingsTreeAction, SettingsTreeNode, SettingsTreeNodes } from "@lichtblick/suite"; import { produce } from "immer"; import * as _ from "lodash-es"; import { useMemo } from "react"; diff --git a/packages/studio-base/src/panels/Indicator/Indicator.tsx b/packages/studio-base/src/panels/Indicator/Indicator.tsx index a6fff37bf1b..38ee5599127 100644 --- a/packages/studio-base/src/panels/Indicator/Indicator.tsx +++ b/packages/studio-base/src/panels/Indicator/Indicator.tsx @@ -2,9 +2,9 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { MessageEvent, PanelExtensionContext, SettingsTreeAction } from "@lichtblick/studio"; import { simpleGetMessagePathDataItems } from "@lichtblick/studio-base/components/MessagePathSyntax/simpleGetMessagePathDataItems"; import Stack from "@lichtblick/studio-base/components/Stack"; +import { MessageEvent, PanelExtensionContext, SettingsTreeAction } from "@lichtblick/suite"; import { Typography } from "@mui/material"; import * as _ from "lodash-es"; import { useCallback, useEffect, useLayoutEffect, useMemo, useReducer, useState } from "react"; diff --git a/packages/studio-base/src/panels/Indicator/index.tsx b/packages/studio-base/src/panels/Indicator/index.tsx index 35f3756e894..ecee0d8dd48 100644 --- a/packages/studio-base/src/panels/Indicator/index.tsx +++ b/packages/studio-base/src/panels/Indicator/index.tsx @@ -3,13 +3,13 @@ // file, You can obtain one at http://mozilla.org/MPL/2.0/ import { useCrash } from "@lichtblick/hooks"; -import { PanelExtensionContext } from "@lichtblick/studio"; import { CaptureErrorBoundary } from "@lichtblick/studio-base/components/CaptureErrorBoundary"; import Panel from "@lichtblick/studio-base/components/Panel"; import { PanelExtensionAdapter } from "@lichtblick/studio-base/components/PanelExtensionAdapter"; import { createSyncRoot } from "@lichtblick/studio-base/panels/createSyncRoot"; import ThemeProvider from "@lichtblick/studio-base/theme/ThemeProvider"; import { SaveConfig } from "@lichtblick/studio-base/types/panels"; +import { PanelExtensionContext } from "@lichtblick/suite"; import { StrictMode, useMemo } from "react"; import { Indicator } from "./Indicator"; diff --git a/packages/studio-base/src/panels/Indicator/settings.ts b/packages/studio-base/src/panels/Indicator/settings.ts index 68f32ba57e5..9f2c5d946a7 100644 --- a/packages/studio-base/src/panels/Indicator/settings.ts +++ b/packages/studio-base/src/panels/Indicator/settings.ts @@ -8,7 +8,7 @@ import { SettingsTreeNode, SettingsTreeNodeAction, SettingsTreeNodes, -} from "@lichtblick/studio"; +} from "@lichtblick/suite"; import { produce } from "immer"; import * as _ from "lodash-es"; import memoizeWeak from "memoize-weak"; diff --git a/packages/studio-base/src/panels/Log/Stamp.tsx b/packages/studio-base/src/panels/Log/Stamp.tsx index 9a4b310b522..fe4590240c7 100644 --- a/packages/studio-base/src/panels/Log/Stamp.tsx +++ b/packages/studio-base/src/panels/Log/Stamp.tsx @@ -11,9 +11,9 @@ // found at http://www.apache.org/licenses/LICENSE-2.0 // You may not use this file except in compliance with the License. -import { Time } from "@lichtblick/studio"; import { TimeDisplayMethod } from "@lichtblick/studio-base/types/panels"; import { formatTime } from "@lichtblick/studio-base/util/formatTime"; +import { Time } from "@lichtblick/suite"; import * as _ from "lodash-es"; // pad the start of `val` with 0's to make the total string length `count` size diff --git a/packages/studio-base/src/panels/Log/conversion.tsx b/packages/studio-base/src/panels/Log/conversion.tsx index 902442c41dd..53bc52625f9 100644 --- a/packages/studio-base/src/panels/Log/conversion.tsx +++ b/packages/studio-base/src/panels/Log/conversion.tsx @@ -2,7 +2,7 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { Time } from "@lichtblick/studio"; +import { Time } from "@lichtblick/suite"; import { fromNanoSec } from "@foxglove/rostime"; import { Log as FoxgloveLog } from "@foxglove/schemas"; diff --git a/packages/studio-base/src/panels/Log/index.tsx b/packages/studio-base/src/panels/Log/index.tsx index 4276542763e..83b61f3b6a9 100644 --- a/packages/studio-base/src/panels/Log/index.tsx +++ b/packages/studio-base/src/panels/Log/index.tsx @@ -11,7 +11,6 @@ // found at http://www.apache.org/licenses/LICENSE-2.0 // You may not use this file except in compliance with the License. -import { SettingsTreeAction } from "@lichtblick/studio"; import { useDataSourceInfo, useMessagesByTopic } from "@lichtblick/studio-base/PanelAPI"; import Panel from "@lichtblick/studio-base/components/Panel"; import PanelToolbar from "@lichtblick/studio-base/components/PanelToolbar"; @@ -20,6 +19,7 @@ import { FilterTagInput } from "@lichtblick/studio-base/panels/Log/FilterTagInpu import { usePanelSettingsTreeUpdate } from "@lichtblick/studio-base/providers/PanelStateContextProvider"; import { SaveConfig } from "@lichtblick/studio-base/types/panels"; import { mightActuallyBePartial } from "@lichtblick/studio-base/util/mightActuallyBePartial"; +import { SettingsTreeAction } from "@lichtblick/suite"; import { Divider } from "@mui/material"; import { produce } from "immer"; import * as _ from "lodash-es"; diff --git a/packages/studio-base/src/panels/Log/settings.ts b/packages/studio-base/src/panels/Log/settings.ts index 2cba3412d2e..b8e1c7665a1 100644 --- a/packages/studio-base/src/panels/Log/settings.ts +++ b/packages/studio-base/src/panels/Log/settings.ts @@ -2,8 +2,8 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { SettingsTreeChildren, SettingsTreeNodes } from "@lichtblick/studio"; import { Topic } from "@lichtblick/studio-base/players/types"; +import { SettingsTreeChildren, SettingsTreeNodes } from "@lichtblick/suite"; import { TFunction } from "i18next"; import { LogLevel } from "./types"; diff --git a/packages/studio-base/src/panels/Log/types.ts b/packages/studio-base/src/panels/Log/types.ts index 0cc41bc2174..67e1e70ac89 100644 --- a/packages/studio-base/src/panels/Log/types.ts +++ b/packages/studio-base/src/panels/Log/types.ts @@ -2,8 +2,8 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { Time, MessageEvent } from "@lichtblick/studio"; import { Header } from "@lichtblick/studio-base/types/Messages"; +import { Time, MessageEvent } from "@lichtblick/suite"; import { Log as FoxgloveLog } from "@foxglove/schemas"; diff --git a/packages/studio-base/src/panels/Map/MapPanel.tsx b/packages/studio-base/src/panels/Map/MapPanel.tsx index 87d6d8299fd..f1c6ad742d3 100644 --- a/packages/studio-base/src/panels/Map/MapPanel.tsx +++ b/packages/studio-base/src/panels/Map/MapPanel.tsx @@ -3,13 +3,6 @@ // file, You can obtain one at http://mozilla.org/MPL/2.0/ import { filterMap } from "@lichtblick/den/collection"; -import { - MessageEvent, - PanelExtensionContext, - SettingsTreeAction, - Subscription, - Topic, -} from "@lichtblick/studio"; import EmptyState from "@lichtblick/studio-base/components/EmptyState"; import Stack from "@lichtblick/studio-base/components/Stack"; import FilteredPointLayer, { @@ -17,6 +10,13 @@ import FilteredPointLayer, { } from "@lichtblick/studio-base/panels/Map/FilteredPointLayer"; import ThemeProvider from "@lichtblick/studio-base/theme/ThemeProvider"; import { darkColor, lightColor, lineColors } from "@lichtblick/studio-base/util/plotColors"; +import { + MessageEvent, + PanelExtensionContext, + SettingsTreeAction, + Subscription, + Topic, +} from "@lichtblick/suite"; import { Feature } from "geojson"; import { produce } from "immer"; import { diff --git a/packages/studio-base/src/panels/Map/config.ts b/packages/studio-base/src/panels/Map/config.ts index 8a9451b9d62..7b0ba143160 100644 --- a/packages/studio-base/src/panels/Map/config.ts +++ b/packages/studio-base/src/panels/Map/config.ts @@ -3,7 +3,7 @@ // file, You can obtain one at http://mozilla.org/MPL/2.0/ import { filterMap } from "@lichtblick/den/collection"; -import { SettingsTreeFields, SettingsTreeNodes, Topic } from "@lichtblick/studio"; +import { SettingsTreeFields, SettingsTreeNodes, Topic } from "@lichtblick/suite"; import * as _ from "lodash-es"; // Persisted panel state diff --git a/packages/studio-base/src/panels/Map/initPanel.tsx b/packages/studio-base/src/panels/Map/initPanel.tsx index 78a26d2ed92..90ae4847d19 100644 --- a/packages/studio-base/src/panels/Map/initPanel.tsx +++ b/packages/studio-base/src/panels/Map/initPanel.tsx @@ -3,9 +3,9 @@ // file, You can obtain one at http://mozilla.org/MPL/2.0/ import { useCrash } from "@lichtblick/hooks"; -import { PanelExtensionContext } from "@lichtblick/studio"; import { CaptureErrorBoundary } from "@lichtblick/studio-base/components/CaptureErrorBoundary"; import { createSyncRoot } from "@lichtblick/studio-base/panels/createSyncRoot"; +import { PanelExtensionContext } from "@lichtblick/suite"; import L from "leaflet"; import LeafletRetinaIconUrl from "leaflet/dist/images/marker-icon-2x.png"; import LeafletIconUrl from "leaflet/dist/images/marker-icon.png"; diff --git a/packages/studio-base/src/panels/Map/support.ts b/packages/studio-base/src/panels/Map/support.ts index 0a4a3139bb9..93e3e58ad7a 100644 --- a/packages/studio-base/src/panels/Map/support.ts +++ b/packages/studio-base/src/panels/Map/support.ts @@ -2,8 +2,8 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { MessageEvent } from "@lichtblick/studio"; import { FoxgloveMessages } from "@lichtblick/studio-base/types/FoxgloveMessages"; +import { MessageEvent } from "@lichtblick/suite"; import { Feature, FeatureCollection, GeoJsonObject } from "geojson"; import { PathOptions, geoJSON } from "leaflet"; diff --git a/packages/studio-base/src/panels/Map/types.ts b/packages/studio-base/src/panels/Map/types.ts index ae729d29310..72869587d87 100644 --- a/packages/studio-base/src/panels/Map/types.ts +++ b/packages/studio-base/src/panels/Map/types.ts @@ -2,8 +2,8 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { MessageEvent } from "@lichtblick/studio"; import { FoxgloveMessages } from "@lichtblick/studio-base/types/FoxgloveMessages"; +import { MessageEvent } from "@lichtblick/suite"; export type Point = { lat: number; diff --git a/packages/studio-base/src/panels/Parameters/index.stories.tsx b/packages/studio-base/src/panels/Parameters/index.stories.tsx index cc0ee46e173..cfaec83db1d 100644 --- a/packages/studio-base/src/panels/Parameters/index.stories.tsx +++ b/packages/studio-base/src/panels/Parameters/index.stories.tsx @@ -2,9 +2,9 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { ParameterValue } from "@lichtblick/studio"; import { PlayerCapabilities } from "@lichtblick/studio-base/players/types"; import PanelSetup from "@lichtblick/studio-base/stories/PanelSetup"; +import { ParameterValue } from "@lichtblick/suite"; import { StoryObj } from "@storybook/react"; import { useState } from "react"; diff --git a/packages/studio-base/src/panels/Parameters/index.tsx b/packages/studio-base/src/panels/Parameters/index.tsx index 8d88f274092..629af13b042 100644 --- a/packages/studio-base/src/panels/Parameters/index.tsx +++ b/packages/studio-base/src/panels/Parameters/index.tsx @@ -11,7 +11,6 @@ // found at http://www.apache.org/licenses/LICENSE-2.0 // You may not use this file except in compliance with the License. -import { ParameterValue } from "@lichtblick/studio"; import CopyButton from "@lichtblick/studio-base/components/CopyButton"; import EmptyState from "@lichtblick/studio-base/components/EmptyState"; import JsonInput from "@lichtblick/studio-base/components/JsonInput"; @@ -23,6 +22,7 @@ import Panel from "@lichtblick/studio-base/components/Panel"; import PanelToolbar from "@lichtblick/studio-base/components/PanelToolbar"; import Stack from "@lichtblick/studio-base/components/Stack"; import { PlayerCapabilities } from "@lichtblick/studio-base/players/types"; +import { ParameterValue } from "@lichtblick/suite"; import CheckIcon from "@mui/icons-material/Check"; import ClearIcon from "@mui/icons-material/Clear"; import { diff --git a/packages/studio-base/src/panels/PlaybackPerformance/index.tsx b/packages/studio-base/src/panels/PlaybackPerformance/index.tsx index 5a49fbae54d..ad7686b2d0a 100644 --- a/packages/studio-base/src/panels/PlaybackPerformance/index.tsx +++ b/packages/studio-base/src/panels/PlaybackPerformance/index.tsx @@ -11,13 +11,13 @@ // found at http://www.apache.org/licenses/LICENSE-2.0 // You may not use this file except in compliance with the License. -import { Immutable } from "@lichtblick/studio"; import { useMessagePipeline } from "@lichtblick/studio-base/components/MessagePipeline"; import Panel from "@lichtblick/studio-base/components/Panel"; import PanelToolbar from "@lichtblick/studio-base/components/PanelToolbar"; import { Sparkline, SparklinePoint } from "@lichtblick/studio-base/components/Sparkline"; import Stack from "@lichtblick/studio-base/components/Stack"; import { PlayerStateActiveData } from "@lichtblick/studio-base/players/types"; +import { Immutable } from "@lichtblick/suite"; import { Typography } from "@mui/material"; import * as _ from "lodash-es"; import { ReactElement } from "react"; diff --git a/packages/studio-base/src/panels/Plot/ChartRenderer.ts b/packages/studio-base/src/panels/Plot/ChartRenderer.ts index f5d828d25ff..2aa4ddd661d 100644 --- a/packages/studio-base/src/panels/Plot/ChartRenderer.ts +++ b/packages/studio-base/src/panels/Plot/ChartRenderer.ts @@ -3,9 +3,9 @@ // file, You can obtain one at http://mozilla.org/MPL/2.0/ import { unwrap } from "@lichtblick/den/monads"; -import { Immutable } from "@lichtblick/studio"; import { Bounds, Bounds1D } from "@lichtblick/studio-base/types/Bounds"; import { maybeCast } from "@lichtblick/studio-base/util/maybeCast"; +import { Immutable } from "@lichtblick/suite"; import { Chart, ChartDataset, ChartOptions, ScatterDataPoint } from "chart.js"; import { AnnotationOptions } from "chartjs-plugin-annotation"; import EventEmitter from "eventemitter3"; diff --git a/packages/studio-base/src/panels/Plot/OffscreenCanvasRenderer.ts b/packages/studio-base/src/panels/Plot/OffscreenCanvasRenderer.ts index 2b28625054a..51a92156417 100644 --- a/packages/studio-base/src/panels/Plot/OffscreenCanvasRenderer.ts +++ b/packages/studio-base/src/panels/Plot/OffscreenCanvasRenderer.ts @@ -3,8 +3,8 @@ // file, You can obtain one at http://mozilla.org/MPL/2.0/ import { ComlinkWrap } from "@lichtblick/den/worker"; -import { Immutable } from "@lichtblick/studio"; import { Bounds } from "@lichtblick/studio-base/types/Bounds"; +import { Immutable } from "@lichtblick/suite"; import type { Theme } from "@mui/material"; import * as Comlink from "comlink"; diff --git a/packages/studio-base/src/panels/Plot/Plot.tsx b/packages/studio-base/src/panels/Plot/Plot.tsx index 66c5a79e383..2aa94625a33 100644 --- a/packages/studio-base/src/panels/Plot/Plot.tsx +++ b/packages/studio-base/src/panels/Plot/Plot.tsx @@ -4,7 +4,6 @@ import { debouncePromise } from "@lichtblick/den/async"; import { filterMap } from "@lichtblick/den/collection"; -import { Immutable } from "@lichtblick/studio"; import KeyListener from "@lichtblick/studio-base/components/KeyListener"; import { fillInGlobalVariablesInPath } from "@lichtblick/studio-base/components/MessagePathSyntax/useCachedGetMessagePathDataItems"; import { @@ -38,6 +37,7 @@ import { SubscribePayload } from "@lichtblick/studio-base/players/types"; import { SaveConfig } from "@lichtblick/studio-base/types/panels"; import { PANEL_TITLE_CONFIG_KEY } from "@lichtblick/studio-base/util/layout"; import { getLineColor } from "@lichtblick/studio-base/util/plotColors"; +import { Immutable } from "@lichtblick/suite"; import { Button, Tooltip, Fade, buttonClasses, useTheme } from "@mui/material"; import Hammer from "hammerjs"; import * as _ from "lodash-es"; diff --git a/packages/studio-base/src/panels/Plot/PlotCoordinator.ts b/packages/studio-base/src/panels/Plot/PlotCoordinator.ts index 5cd567228d2..1d59c03407e 100644 --- a/packages/studio-base/src/panels/Plot/PlotCoordinator.ts +++ b/packages/studio-base/src/panels/Plot/PlotCoordinator.ts @@ -4,7 +4,6 @@ import { debouncePromise } from "@lichtblick/den/async"; import { filterMap } from "@lichtblick/den/collection"; -import { Immutable, Time } from "@lichtblick/studio"; import { simpleGetMessagePathDataItems } from "@lichtblick/studio-base/components/MessagePathSyntax/simpleGetMessagePathDataItems"; import { stringifyMessagePath } from "@lichtblick/studio-base/components/MessagePathSyntax/stringifyRosPath"; import { fillInGlobalVariablesInPath } from "@lichtblick/studio-base/components/MessagePathSyntax/useCachedGetMessagePathDataItems"; @@ -14,6 +13,7 @@ import { MessageBlock, PlayerState } from "@lichtblick/studio-base/players/types import { Bounds } from "@lichtblick/studio-base/types/Bounds"; import delay from "@lichtblick/studio-base/util/delay"; import { getContrastColor, getLineColor } from "@lichtblick/studio-base/util/plotColors"; +import { Immutable, Time } from "@lichtblick/suite"; import EventEmitter from "eventemitter3"; import * as _ from "lodash-es"; diff --git a/packages/studio-base/src/panels/Plot/PlotLegend.tsx b/packages/studio-base/src/panels/Plot/PlotLegend.tsx index 413fa2f933a..e9ccd16d46d 100644 --- a/packages/studio-base/src/panels/Plot/PlotLegend.tsx +++ b/packages/studio-base/src/panels/Plot/PlotLegend.tsx @@ -10,8 +10,8 @@ import { TextBulletListLtr20Filled, ArrowMinimize20Filled, } from "@fluentui/react-icons"; -import { Immutable } from "@lichtblick/studio"; import { SaveConfig } from "@lichtblick/studio-base/types/panels"; +import { Immutable } from "@lichtblick/suite"; import { IconButton } from "@mui/material"; import * as _ from "lodash-es"; import { useCallback, useEffect, useMemo, useRef, useState } from "react"; diff --git a/packages/studio-base/src/panels/Plot/PlotLegendRow.tsx b/packages/studio-base/src/panels/Plot/PlotLegendRow.tsx index abc86caf327..7784dd6dc41 100644 --- a/packages/studio-base/src/panels/Plot/PlotLegendRow.tsx +++ b/packages/studio-base/src/panels/Plot/PlotLegendRow.tsx @@ -9,11 +9,11 @@ import { Square12Filled, Square12Regular, } from "@fluentui/react-icons"; -import { Immutable } from "@lichtblick/studio"; import { usePanelContext } from "@lichtblick/studio-base/components/PanelContext"; import { useSelectedPanels } from "@lichtblick/studio-base/context/CurrentLayoutContext"; import { useWorkspaceActions } from "@lichtblick/studio-base/context/Workspace/useWorkspaceActions"; import { getLineColor } from "@lichtblick/studio-base/util/plotColors"; +import { Immutable } from "@lichtblick/suite"; import { ButtonBase, Checkbox, Tooltip, Typography, buttonBaseClasses } from "@mui/material"; import { MouseEventHandler } from "react"; import { useTranslation } from "react-i18next"; diff --git a/packages/studio-base/src/panels/Plot/builders/BlockTopicCursor.test.ts b/packages/studio-base/src/panels/Plot/builders/BlockTopicCursor.test.ts index 083b2dcff59..6348331673c 100644 --- a/packages/studio-base/src/panels/Plot/builders/BlockTopicCursor.test.ts +++ b/packages/studio-base/src/panels/Plot/builders/BlockTopicCursor.test.ts @@ -2,7 +2,7 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { MessageEvent } from "@lichtblick/studio"; +import { MessageEvent } from "@lichtblick/suite"; import * as _ from "lodash-es"; import { BlockTopicCursor } from "./BlockTopicCursor"; diff --git a/packages/studio-base/src/panels/Plot/builders/BlockTopicCursor.ts b/packages/studio-base/src/panels/Plot/builders/BlockTopicCursor.ts index 0a9c3862e3f..294cac61a42 100644 --- a/packages/studio-base/src/panels/Plot/builders/BlockTopicCursor.ts +++ b/packages/studio-base/src/panels/Plot/builders/BlockTopicCursor.ts @@ -2,8 +2,8 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { Immutable, MessageEvent } from "@lichtblick/studio"; import { MessageBlock } from "@lichtblick/studio-base/players/types"; +import { Immutable, MessageEvent } from "@lichtblick/suite"; /** * BlockTopicCursor tracks the last seen block messages for a given topic and can produce the next diff --git a/packages/studio-base/src/panels/Plot/builders/CurrentCustomDatasetsBuilder.ts b/packages/studio-base/src/panels/Plot/builders/CurrentCustomDatasetsBuilder.ts index c76e705418e..211fcdf1f34 100644 --- a/packages/studio-base/src/panels/Plot/builders/CurrentCustomDatasetsBuilder.ts +++ b/packages/studio-base/src/panels/Plot/builders/CurrentCustomDatasetsBuilder.ts @@ -3,9 +3,9 @@ // file, You can obtain one at http://mozilla.org/MPL/2.0/ import { filterMap } from "@lichtblick/den/collection"; -import { Immutable, Time, MessageEvent } from "@lichtblick/studio"; import { simpleGetMessagePathDataItems } from "@lichtblick/studio-base/components/MessagePathSyntax/simpleGetMessagePathDataItems"; import { PlayerState } from "@lichtblick/studio-base/players/types"; +import { Immutable, Time, MessageEvent } from "@lichtblick/suite"; import { ChartDataset } from "chart.js"; import * as _ from "lodash-es"; diff --git a/packages/studio-base/src/panels/Plot/builders/CustomDatasetsBuilder.test.ts b/packages/studio-base/src/panels/Plot/builders/CustomDatasetsBuilder.test.ts index e22cff7e9e1..6957e15284d 100644 --- a/packages/studio-base/src/panels/Plot/builders/CustomDatasetsBuilder.test.ts +++ b/packages/studio-base/src/panels/Plot/builders/CustomDatasetsBuilder.test.ts @@ -4,13 +4,13 @@ import { unwrap } from "@lichtblick/den/monads"; import { makeComlinkWorkerMock } from "@lichtblick/den/testing"; -import { MessageEvent } from "@lichtblick/studio"; import { MessageBlock, PlayerPresence, PlayerState, PlayerStateActiveData, } from "@lichtblick/studio-base/players/types"; +import { MessageEvent } from "@lichtblick/suite"; import * as _ from "lodash-es"; import { parseMessagePath } from "@foxglove/message-path"; diff --git a/packages/studio-base/src/panels/Plot/builders/CustomDatasetsBuilder.ts b/packages/studio-base/src/panels/Plot/builders/CustomDatasetsBuilder.ts index f6c2640325d..293e2217fd5 100644 --- a/packages/studio-base/src/panels/Plot/builders/CustomDatasetsBuilder.ts +++ b/packages/studio-base/src/panels/Plot/builders/CustomDatasetsBuilder.ts @@ -3,11 +3,11 @@ // file, You can obtain one at http://mozilla.org/MPL/2.0/ import { ComlinkWrap } from "@lichtblick/den/worker"; -import { Immutable, MessageEvent } from "@lichtblick/studio"; import { simpleGetMessagePathDataItems } from "@lichtblick/studio-base/components/MessagePathSyntax/simpleGetMessagePathDataItems"; import { Bounds1D } from "@lichtblick/studio-base/components/TimeBasedChart/types"; import { PlayerState } from "@lichtblick/studio-base/players/types"; import { extendBounds1D, unionBounds1D } from "@lichtblick/studio-base/types/Bounds"; +import { Immutable, MessageEvent } from "@lichtblick/suite"; import * as Comlink from "comlink"; import { MessagePath } from "@foxglove/message-path"; diff --git a/packages/studio-base/src/panels/Plot/builders/CustomDatasetsBuilderImpl.ts b/packages/studio-base/src/panels/Plot/builders/CustomDatasetsBuilderImpl.ts index b2d1fc5358d..436573b6f32 100644 --- a/packages/studio-base/src/panels/Plot/builders/CustomDatasetsBuilderImpl.ts +++ b/packages/studio-base/src/panels/Plot/builders/CustomDatasetsBuilderImpl.ts @@ -2,10 +2,10 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { Immutable, Time } from "@lichtblick/studio"; import { downsampleScatter } from "@lichtblick/studio-base/components/TimeBasedChart/downsample"; import { Bounds1D } from "@lichtblick/studio-base/components/TimeBasedChart/types"; import { extendBounds1D } from "@lichtblick/studio-base/types/Bounds"; +import { Immutable, Time } from "@lichtblick/suite"; import { compare } from "@foxglove/rostime"; diff --git a/packages/studio-base/src/panels/Plot/builders/IDatasetsBuilder.ts b/packages/studio-base/src/panels/Plot/builders/IDatasetsBuilder.ts index 68bae4ff451..5ad9f9cd498 100644 --- a/packages/studio-base/src/panels/Plot/builders/IDatasetsBuilder.ts +++ b/packages/studio-base/src/panels/Plot/builders/IDatasetsBuilder.ts @@ -2,10 +2,10 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import type { Immutable, Time } from "@lichtblick/studio"; import type { Bounds1D } from "@lichtblick/studio-base/components/TimeBasedChart/types"; import type { MessageBlock, PlayerState } from "@lichtblick/studio-base/players/types"; import { TimestampMethod } from "@lichtblick/studio-base/util/time"; +import type { Immutable, Time } from "@lichtblick/suite"; import { Opaque } from "ts-essentials"; import { MessagePath } from "@foxglove/message-path"; diff --git a/packages/studio-base/src/panels/Plot/builders/IndexDatasetsBuilder.ts b/packages/studio-base/src/panels/Plot/builders/IndexDatasetsBuilder.ts index 0d0fb7bcf15..e6864ec670c 100644 --- a/packages/studio-base/src/panels/Plot/builders/IndexDatasetsBuilder.ts +++ b/packages/studio-base/src/panels/Plot/builders/IndexDatasetsBuilder.ts @@ -3,10 +3,10 @@ // file, You can obtain one at http://mozilla.org/MPL/2.0/ import { filterMap } from "@lichtblick/den/collection"; -import { Immutable, Time, MessageEvent } from "@lichtblick/studio"; import { simpleGetMessagePathDataItems } from "@lichtblick/studio-base/components/MessagePathSyntax/simpleGetMessagePathDataItems"; import { Bounds1D } from "@lichtblick/studio-base/components/TimeBasedChart/types"; import { PlayerState } from "@lichtblick/studio-base/players/types"; +import { Immutable, Time, MessageEvent } from "@lichtblick/suite"; import { ChartDataset } from "chart.js"; import { MessagePath } from "@foxglove/message-path"; diff --git a/packages/studio-base/src/panels/Plot/builders/TimestampDatasetsBuilder.test.ts b/packages/studio-base/src/panels/Plot/builders/TimestampDatasetsBuilder.test.ts index 07c8b5748a6..b67584a089a 100644 --- a/packages/studio-base/src/panels/Plot/builders/TimestampDatasetsBuilder.test.ts +++ b/packages/studio-base/src/panels/Plot/builders/TimestampDatasetsBuilder.test.ts @@ -4,13 +4,13 @@ import { unwrap } from "@lichtblick/den/monads"; import { makeComlinkWorkerMock } from "@lichtblick/den/testing"; -import { MessageEvent } from "@lichtblick/studio"; import { MessageBlock, PlayerPresence, PlayerState, PlayerStateActiveData, } from "@lichtblick/studio-base/players/types"; +import { MessageEvent } from "@lichtblick/suite"; import * as _ from "lodash-es"; import { parseMessagePath } from "@foxglove/message-path"; diff --git a/packages/studio-base/src/panels/Plot/builders/TimestampDatasetsBuilder.ts b/packages/studio-base/src/panels/Plot/builders/TimestampDatasetsBuilder.ts index b27688227cb..1aee2f69063 100644 --- a/packages/studio-base/src/panels/Plot/builders/TimestampDatasetsBuilder.ts +++ b/packages/studio-base/src/panels/Plot/builders/TimestampDatasetsBuilder.ts @@ -3,10 +3,10 @@ // file, You can obtain one at http://mozilla.org/MPL/2.0/ import { ComlinkWrap } from "@lichtblick/den/worker"; -import { Immutable, MessageEvent, Time } from "@lichtblick/studio"; import { simpleGetMessagePathDataItems } from "@lichtblick/studio-base/components/MessagePathSyntax/simpleGetMessagePathDataItems"; import { MessageBlock, PlayerState } from "@lichtblick/studio-base/players/types"; import { TimestampMethod, getTimestampForMessage } from "@lichtblick/studio-base/util/time"; +import { Immutable, MessageEvent, Time } from "@lichtblick/suite"; import * as Comlink from "comlink"; import { MessagePath } from "@foxglove/message-path"; diff --git a/packages/studio-base/src/panels/Plot/builders/TimestampDatasetsBuilderImpl.ts b/packages/studio-base/src/panels/Plot/builders/TimestampDatasetsBuilderImpl.ts index 8a1ea6b7752..87cfb4a18db 100644 --- a/packages/studio-base/src/panels/Plot/builders/TimestampDatasetsBuilderImpl.ts +++ b/packages/studio-base/src/panels/Plot/builders/TimestampDatasetsBuilderImpl.ts @@ -2,7 +2,6 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { Immutable, Time } from "@lichtblick/studio"; import { MAX_POINTS, downsampleScatter, @@ -10,6 +9,7 @@ import { } from "@lichtblick/studio-base/components/TimeBasedChart/downsample"; import { Bounds1D } from "@lichtblick/studio-base/components/TimeBasedChart/types"; import { extendBounds1D } from "@lichtblick/studio-base/types/Bounds"; +import { Immutable, Time } from "@lichtblick/suite"; import { CsvDataset, SeriesConfigKey, SeriesItem, Viewport } from "./IDatasetsBuilder"; import type { Dataset } from "../ChartRenderer"; diff --git a/packages/studio-base/src/panels/Plot/config.ts b/packages/studio-base/src/panels/Plot/config.ts index 7e17810a8ed..808cc73666c 100644 --- a/packages/studio-base/src/panels/Plot/config.ts +++ b/packages/studio-base/src/panels/Plot/config.ts @@ -2,11 +2,11 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { Immutable } from "@lichtblick/studio"; import { MessagePathDataItem } from "@lichtblick/studio-base/components/MessagePathSyntax/useCachedGetMessagePathDataItems"; import { MessageEvent } from "@lichtblick/studio-base/players/types"; import { PANEL_TITLE_CONFIG_KEY } from "@lichtblick/studio-base/util/layout"; import { TimestampMethod } from "@lichtblick/studio-base/util/time"; +import { Immutable } from "@lichtblick/suite"; import { Time } from "@foxglove/rostime"; diff --git a/packages/studio-base/src/panels/Plot/csv.ts b/packages/studio-base/src/panels/Plot/csv.ts index ee2662013d6..53f24d88dd1 100644 --- a/packages/studio-base/src/panels/Plot/csv.ts +++ b/packages/studio-base/src/panels/Plot/csv.ts @@ -2,9 +2,9 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { Immutable } from "@lichtblick/studio"; import { downloadFiles } from "@lichtblick/studio-base/util/download"; import { formatTimeRaw } from "@lichtblick/studio-base/util/time"; +import { Immutable } from "@lichtblick/suite"; import { CsvDataset } from "./builders/IDatasetsBuilder"; import { PlotXAxisVal } from "./config"; diff --git a/packages/studio-base/src/panels/Plot/datum.ts b/packages/studio-base/src/panels/Plot/datum.ts index 454d7b93798..2b451124d57 100644 --- a/packages/studio-base/src/panels/Plot/datum.ts +++ b/packages/studio-base/src/panels/Plot/datum.ts @@ -2,7 +2,7 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { Time } from "@lichtblick/studio"; +import { Time } from "@lichtblick/suite"; import { ScatterDataPoint } from "chart.js"; import { isTime, toSec } from "@foxglove/rostime"; diff --git a/packages/studio-base/src/panels/Plot/settings.ts b/packages/studio-base/src/panels/Plot/settings.ts index deddcb79d49..560d837a6b2 100644 --- a/packages/studio-base/src/panels/Plot/settings.ts +++ b/packages/studio-base/src/panels/Plot/settings.ts @@ -2,10 +2,10 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { SettingsTreeAction, SettingsTreeNode, SettingsTreeNodes } from "@lichtblick/studio"; import { usePanelSettingsTreeUpdate } from "@lichtblick/studio-base/providers/PanelStateContextProvider"; import { SaveConfig } from "@lichtblick/studio-base/types/panels"; import { lineColors } from "@lichtblick/studio-base/util/plotColors"; +import { SettingsTreeAction, SettingsTreeNode, SettingsTreeNodes } from "@lichtblick/suite"; import { TFunction } from "i18next"; import { produce } from "immer"; import * as _ from "lodash-es"; diff --git a/packages/studio-base/src/panels/Plot/subscription.ts b/packages/studio-base/src/panels/Plot/subscription.ts index 12714391f76..7eb22cd64c2 100644 --- a/packages/studio-base/src/panels/Plot/subscription.ts +++ b/packages/studio-base/src/panels/Plot/subscription.ts @@ -2,11 +2,11 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import type { Immutable } from "@lichtblick/studio"; import type { SubscribePayload, SubscriptionPreloadType, } from "@lichtblick/studio-base/players/types"; +import type { Immutable } from "@lichtblick/suite"; import type { MessagePathPart, MessagePath } from "@foxglove/message-path"; diff --git a/packages/studio-base/src/panels/Publish/buildSampleMessage.ts b/packages/studio-base/src/panels/Publish/buildSampleMessage.ts index d7f70e9abd8..14272caf0cc 100644 --- a/packages/studio-base/src/panels/Publish/buildSampleMessage.ts +++ b/packages/studio-base/src/panels/Publish/buildSampleMessage.ts @@ -11,8 +11,8 @@ // found at http://www.apache.org/licenses/LICENSE-2.0 // You may not use this file except in compliance with the License. -import { Immutable } from "@lichtblick/studio"; import { RosDatatypes } from "@lichtblick/studio-base/types/RosDatatypes"; +import { Immutable } from "@lichtblick/suite"; export const builtinSampleValues: Record = { bool: false, diff --git a/packages/studio-base/src/panels/Publish/index.tsx b/packages/studio-base/src/panels/Publish/index.tsx index 46b8080a29b..4aa26f35444 100644 --- a/packages/studio-base/src/panels/Publish/index.tsx +++ b/packages/studio-base/src/panels/Publish/index.tsx @@ -11,7 +11,6 @@ // found at http://www.apache.org/licenses/LICENSE-2.0 // You may not use this file except in compliance with the License. -import { Immutable } from "@lichtblick/studio"; import { useDataSourceInfo } from "@lichtblick/studio-base/PanelAPI"; import { MessagePipelineContext, @@ -25,6 +24,7 @@ import usePublisher from "@lichtblick/studio-base/hooks/usePublisher"; import { PlayerCapabilities } from "@lichtblick/studio-base/players/types"; import { useDefaultPanelTitle } from "@lichtblick/studio-base/providers/PanelStateContextProvider"; import { SaveConfig } from "@lichtblick/studio-base/types/panels"; +import { Immutable } from "@lichtblick/suite"; import { Button, inputBaseClasses, TextField, Tooltip, Typography } from "@mui/material"; import { useEffect, useMemo } from "react"; import { makeStyles } from "tss-react/mui"; diff --git a/packages/studio-base/src/panels/Publish/settings.ts b/packages/studio-base/src/panels/Publish/settings.ts index 65f02aba037..9f9fba69368 100644 --- a/packages/studio-base/src/panels/Publish/settings.ts +++ b/packages/studio-base/src/panels/Publish/settings.ts @@ -2,12 +2,12 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { Immutable, SettingsTreeAction, SettingsTreeNodes } from "@lichtblick/studio"; import buildSampleMessage from "@lichtblick/studio-base/panels/Publish/buildSampleMessage"; import { Topic } from "@lichtblick/studio-base/players/types"; import { usePanelSettingsTreeUpdate } from "@lichtblick/studio-base/providers/PanelStateContextProvider"; import { RosDatatypes } from "@lichtblick/studio-base/types/RosDatatypes"; import { SaveConfig } from "@lichtblick/studio-base/types/panels"; +import { Immutable, SettingsTreeAction, SettingsTreeNodes } from "@lichtblick/suite"; import { produce } from "immer"; import * as _ from "lodash-es"; import { useCallback, useEffect, useMemo } from "react"; diff --git a/packages/studio-base/src/panels/RawMessages/Toolbar.tsx b/packages/studio-base/src/panels/RawMessages/Toolbar.tsx index 425273dbb8a..afdad8c8274 100644 --- a/packages/studio-base/src/panels/RawMessages/Toolbar.tsx +++ b/packages/studio-base/src/panels/RawMessages/Toolbar.tsx @@ -2,11 +2,11 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { Topic } from "@lichtblick/studio"; import MessagePathInput from "@lichtblick/studio-base/components/MessagePathSyntax/MessagePathInput"; import PanelToolbar from "@lichtblick/studio-base/components/PanelToolbar"; import Stack from "@lichtblick/studio-base/components/Stack"; import { SaveConfig } from "@lichtblick/studio-base/types/panels"; +import { Topic } from "@lichtblick/suite"; import DiffIcon from "@mui/icons-material/Difference"; import DiffOutlinedIcon from "@mui/icons-material/DifferenceOutlined"; import UnfoldLessIcon from "@mui/icons-material/UnfoldLess"; diff --git a/packages/studio-base/src/panels/RawMessages/index.tsx b/packages/studio-base/src/panels/RawMessages/index.tsx index c0b06894395..f9aad183b42 100644 --- a/packages/studio-base/src/panels/RawMessages/index.tsx +++ b/packages/studio-base/src/panels/RawMessages/index.tsx @@ -11,7 +11,6 @@ // found at http://www.apache.org/licenses/LICENSE-2.0 // You may not use this file except in compliance with the License. -import { Immutable, SettingsTreeAction } from "@lichtblick/studio"; import { useDataSourceInfo } from "@lichtblick/studio-base/PanelAPI"; import EmptyState from "@lichtblick/studio-base/components/EmptyState"; import useGetItemStringWithTimezone from "@lichtblick/studio-base/components/JsonTree/useGetItemStringWithTimezone"; @@ -35,6 +34,7 @@ import { usePanelSettingsTreeUpdate } from "@lichtblick/studio-base/providers/Pa import { SaveConfig } from "@lichtblick/studio-base/types/panels"; import { enumValuesByDatatypeAndField } from "@lichtblick/studio-base/util/enums"; import { useJsonTreeTheme } from "@lichtblick/studio-base/util/globalConstants"; +import { Immutable, SettingsTreeAction } from "@lichtblick/suite"; import { Checkbox, FormControlLabel, Typography, useTheme } from "@mui/material"; import * as _ from "lodash-es"; import { useCallback, useEffect, useMemo, useState } from "react"; diff --git a/packages/studio-base/src/panels/StateTransitions/index.tsx b/packages/studio-base/src/panels/StateTransitions/index.tsx index cbd315120bc..5584e8a7242 100644 --- a/packages/studio-base/src/panels/StateTransitions/index.tsx +++ b/packages/studio-base/src/panels/StateTransitions/index.tsx @@ -12,7 +12,6 @@ // You may not use this file except in compliance with the License. import { filterMap } from "@lichtblick/den/collection"; -import { Immutable } from "@lichtblick/studio"; import { useBlocksSubscriptions } from "@lichtblick/studio-base/PanelAPI"; import { MessageAndData, @@ -36,6 +35,7 @@ import { subscribePayloadFromMessagePath } from "@lichtblick/studio-base/players import { SubscribePayload } from "@lichtblick/studio-base/players/types"; import { Bounds } from "@lichtblick/studio-base/types/Bounds"; import { SaveConfig } from "@lichtblick/studio-base/types/panels"; +import { Immutable } from "@lichtblick/suite"; import { ChartOptions, ScaleOptions } from "chart.js"; import * as _ from "lodash-es"; import * as R from "ramda"; diff --git a/packages/studio-base/src/panels/StateTransitions/settings.ts b/packages/studio-base/src/panels/StateTransitions/settings.ts index e840b121b8a..045e51c991c 100644 --- a/packages/studio-base/src/panels/StateTransitions/settings.ts +++ b/packages/studio-base/src/panels/StateTransitions/settings.ts @@ -2,10 +2,10 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { SettingsTreeAction, SettingsTreeNode, SettingsTreeNodes } from "@lichtblick/studio"; import { plotableRosTypes } from "@lichtblick/studio-base/panels/Plot/plotableRosTypes"; import { usePanelSettingsTreeUpdate } from "@lichtblick/studio-base/providers/PanelStateContextProvider"; import { SaveConfig } from "@lichtblick/studio-base/types/panels"; +import { SettingsTreeAction, SettingsTreeNode, SettingsTreeNodes } from "@lichtblick/suite"; import { TFunction } from "i18next"; import { produce } from "immer"; import * as _ from "lodash-es"; diff --git a/packages/studio-base/src/panels/Teleop/TeleopPanel.tsx b/packages/studio-base/src/panels/Teleop/TeleopPanel.tsx index 96aa6ea08a8..42cd6e95b19 100644 --- a/packages/studio-base/src/panels/Teleop/TeleopPanel.tsx +++ b/packages/studio-base/src/panels/Teleop/TeleopPanel.tsx @@ -2,16 +2,16 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ +import EmptyState from "@lichtblick/studio-base/components/EmptyState"; +import Stack from "@lichtblick/studio-base/components/Stack"; +import ThemeProvider from "@lichtblick/studio-base/theme/ThemeProvider"; import { PanelExtensionContext, SettingsTreeAction, SettingsTreeNode, SettingsTreeNodes, Topic, -} from "@lichtblick/studio"; -import EmptyState from "@lichtblick/studio-base/components/EmptyState"; -import Stack from "@lichtblick/studio-base/components/Stack"; -import ThemeProvider from "@lichtblick/studio-base/theme/ThemeProvider"; +} from "@lichtblick/suite"; import * as _ from "lodash-es"; import { useCallback, useEffect, useLayoutEffect, useState } from "react"; import { DeepPartial } from "ts-essentials"; diff --git a/packages/studio-base/src/panels/Teleop/index.tsx b/packages/studio-base/src/panels/Teleop/index.tsx index d4b0b1a6c56..a3a1ab83868 100644 --- a/packages/studio-base/src/panels/Teleop/index.tsx +++ b/packages/studio-base/src/panels/Teleop/index.tsx @@ -3,12 +3,12 @@ // file, You can obtain one at http://mozilla.org/MPL/2.0/ import { useCrash } from "@lichtblick/hooks"; -import { PanelExtensionContext } from "@lichtblick/studio"; import { CaptureErrorBoundary } from "@lichtblick/studio-base/components/CaptureErrorBoundary"; import Panel from "@lichtblick/studio-base/components/Panel"; import { PanelExtensionAdapter } from "@lichtblick/studio-base/components/PanelExtensionAdapter"; import { createSyncRoot } from "@lichtblick/studio-base/panels/createSyncRoot"; import { SaveConfig } from "@lichtblick/studio-base/types/panels"; +import { PanelExtensionContext } from "@lichtblick/suite"; import { StrictMode, useMemo } from "react"; import TeleopPanel from "./TeleopPanel"; diff --git a/packages/studio-base/src/panels/ThreeDeeRender/IRenderer.ts b/packages/studio-base/src/panels/ThreeDeeRender/IRenderer.ts index f02cb39776e..a6052b7d446 100644 --- a/packages/studio-base/src/panels/ThreeDeeRender/IRenderer.ts +++ b/packages/studio-base/src/panels/ThreeDeeRender/IRenderer.ts @@ -2,14 +2,6 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { - Immutable, - MessageEvent, - ParameterValue, - SettingsIcon, - Topic, - VariableValue, -} from "@lichtblick/studio"; import { PanelContextMenuItem } from "@lichtblick/studio-base/components/PanelContextMenu"; import { BuiltinPanelExtensionContext, @@ -19,6 +11,14 @@ import { import { HUDItemManager } from "@lichtblick/studio-base/panels/ThreeDeeRender/HUDItemManager"; import { ICameraHandler } from "@lichtblick/studio-base/panels/ThreeDeeRender/renderables/ICameraHandler"; import IAnalytics from "@lichtblick/studio-base/services/IAnalytics"; +import { + Immutable, + MessageEvent, + ParameterValue, + SettingsIcon, + Topic, + VariableValue, +} from "@lichtblick/suite"; import EventEmitter from "eventemitter3"; import * as THREE from "three"; diff --git a/packages/studio-base/src/panels/ThreeDeeRender/Interactions/Interactions.tsx b/packages/studio-base/src/panels/ThreeDeeRender/Interactions/Interactions.tsx index 943fbd364c2..e90cab90933 100644 --- a/packages/studio-base/src/panels/ThreeDeeRender/Interactions/Interactions.tsx +++ b/packages/studio-base/src/panels/ThreeDeeRender/Interactions/Interactions.tsx @@ -12,11 +12,11 @@ // You may not use this file except in compliance with the License. import { Cursor20Regular } from "@fluentui/react-icons"; -import type { LayoutActions } from "@lichtblick/studio"; import ExpandingToolbar, { ToolGroup, ToolGroupFixedSizePane, } from "@lichtblick/studio-base/components/ExpandingToolbar"; +import type { LayoutActions } from "@lichtblick/suite"; import { Typography } from "@mui/material"; import ObjectDetails from "./ObjectDetails"; diff --git a/packages/studio-base/src/panels/ThreeDeeRender/Interactions/TopicLink.tsx b/packages/studio-base/src/panels/ThreeDeeRender/Interactions/TopicLink.tsx index e64de9de827..46519b55f95 100644 --- a/packages/studio-base/src/panels/ThreeDeeRender/Interactions/TopicLink.tsx +++ b/packages/studio-base/src/panels/ThreeDeeRender/Interactions/TopicLink.tsx @@ -11,8 +11,8 @@ // found at http://www.apache.org/licenses/LICENSE-2.0 // You may not use this file except in compliance with the License. -import type { LayoutActions } from "@lichtblick/studio"; import Stack from "@lichtblick/studio-base/components/Stack"; +import type { LayoutActions } from "@lichtblick/suite"; import OpenInNewIcon from "@mui/icons-material/OpenInNew"; import SettingsIcon from "@mui/icons-material/Settings"; import { IconButton, Typography } from "@mui/material"; diff --git a/packages/studio-base/src/panels/ThreeDeeRender/Renderer.test.ts b/packages/studio-base/src/panels/ThreeDeeRender/Renderer.test.ts index ca141f3b22a..742aecac21c 100644 --- a/packages/studio-base/src/panels/ThreeDeeRender/Renderer.test.ts +++ b/packages/studio-base/src/panels/ThreeDeeRender/Renderer.test.ts @@ -3,7 +3,6 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { MessageEvent } from "@lichtblick/studio"; import { Asset } from "@lichtblick/studio-base/components/PanelExtensionAdapter"; import { Renderer } from "@lichtblick/studio-base/panels/ThreeDeeRender/Renderer"; import { DEFAULT_SCENE_EXTENSION_CONFIG } from "@lichtblick/studio-base/panels/ThreeDeeRender/SceneExtensionConfig"; @@ -11,6 +10,7 @@ import { DEFAULT_CAMERA_STATE } from "@lichtblick/studio-base/panels/ThreeDeeRen import { CameraStateSettings } from "@lichtblick/studio-base/panels/ThreeDeeRender/renderables/CameraStateSettings"; import { DEFAULT_PUBLISH_SETTINGS } from "@lichtblick/studio-base/panels/ThreeDeeRender/renderables/PublishSettings"; import { TFMessage } from "@lichtblick/studio-base/panels/ThreeDeeRender/ros"; +import { MessageEvent } from "@lichtblick/suite"; import { setupJestCanvasMock } from "jest-canvas-mock"; import { fromNanoSec, toNanoSec } from "@foxglove/rostime"; diff --git a/packages/studio-base/src/panels/ThreeDeeRender/Renderer.ts b/packages/studio-base/src/panels/ThreeDeeRender/Renderer.ts index 29fa79c35f0..ed7d2472816 100644 --- a/packages/studio-base/src/panels/ThreeDeeRender/Renderer.ts +++ b/packages/studio-base/src/panels/ThreeDeeRender/Renderer.ts @@ -4,17 +4,6 @@ import { ObjectPool } from "@lichtblick/den/collection"; import Logger from "@lichtblick/log"; -import { - Immutable, - MessageEvent, - ParameterValue, - SettingsIcon, - SettingsTreeAction, - SettingsTreeNodeActionItem, - SettingsTreeNodes, - Topic, - VariableValue, -} from "@lichtblick/studio"; import { PanelContextMenuItem } from "@lichtblick/studio-base/components/PanelContextMenu"; import { Asset, @@ -26,6 +15,17 @@ import { HUDItemManager } from "@lichtblick/studio-base/panels/ThreeDeeRender/HU import { LayerErrors } from "@lichtblick/studio-base/panels/ThreeDeeRender/LayerErrors"; import { ICameraHandler } from "@lichtblick/studio-base/panels/ThreeDeeRender/renderables/ICameraHandler"; import IAnalytics from "@lichtblick/studio-base/services/IAnalytics"; +import { + Immutable, + MessageEvent, + ParameterValue, + SettingsIcon, + SettingsTreeAction, + SettingsTreeNodeActionItem, + SettingsTreeNodes, + Topic, + VariableValue, +} from "@lichtblick/suite"; import EventEmitter from "eventemitter3"; import { quat, vec3 } from "gl-matrix"; import i18next from "i18next"; diff --git a/packages/studio-base/src/panels/ThreeDeeRender/RendererOverlay.tsx b/packages/studio-base/src/panels/ThreeDeeRender/RendererOverlay.tsx index da35ef67ea4..8447618c954 100644 --- a/packages/studio-base/src/panels/ThreeDeeRender/RendererOverlay.tsx +++ b/packages/studio-base/src/panels/ThreeDeeRender/RendererOverlay.tsx @@ -3,7 +3,6 @@ // file, You can obtain one at http://mozilla.org/MPL/2.0/ import { Ruler20Filled, Ruler20Regular } from "@fluentui/react-icons"; -import { LayoutActions } from "@lichtblick/studio"; import { PanelContextMenu, PanelContextMenuItem, @@ -13,6 +12,7 @@ import PublishPointIcon from "@lichtblick/studio-base/components/PublishPointIco import PublishPoseEstimateIcon from "@lichtblick/studio-base/components/PublishPoseEstimateIcon"; import { usePanelMousePresence } from "@lichtblick/studio-base/hooks/usePanelMousePresence"; import { HUD } from "@lichtblick/studio-base/panels/ThreeDeeRender/HUD"; +import { LayoutActions } from "@lichtblick/suite"; import { Button, IconButton, diff --git a/packages/studio-base/src/panels/ThreeDeeRender/SceneExtension.ts b/packages/studio-base/src/panels/ThreeDeeRender/SceneExtension.ts index b79ad393a6b..91778f83943 100644 --- a/packages/studio-base/src/panels/ThreeDeeRender/SceneExtension.ts +++ b/packages/studio-base/src/panels/ThreeDeeRender/SceneExtension.ts @@ -2,9 +2,9 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { MessageEvent, SettingsTreeAction } from "@lichtblick/studio"; import { PanelContextMenuItem } from "@lichtblick/studio-base/components/PanelContextMenu"; import { DraggedMessagePath } from "@lichtblick/studio-base/components/PanelExtensionAdapter"; +import { MessageEvent, SettingsTreeAction } from "@lichtblick/suite"; import * as _ from "lodash-es"; import * as THREE from "three"; import { DeepPartial, Writable } from "ts-essentials"; diff --git a/packages/studio-base/src/panels/ThreeDeeRender/SettingsManager.ts b/packages/studio-base/src/panels/ThreeDeeRender/SettingsManager.ts index 323d865c571..0652f6c3d1a 100644 --- a/packages/studio-base/src/panels/ThreeDeeRender/SettingsManager.ts +++ b/packages/studio-base/src/panels/ThreeDeeRender/SettingsManager.ts @@ -2,7 +2,7 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { SettingsTreeAction, SettingsTreeNode, SettingsTreeNodes } from "@lichtblick/studio"; +import { SettingsTreeAction, SettingsTreeNode, SettingsTreeNodes } from "@lichtblick/suite"; import EventEmitter from "eventemitter3"; import { produce } from "immer"; diff --git a/packages/studio-base/src/panels/ThreeDeeRender/ThreeDeeRender.tsx b/packages/studio-base/src/panels/ThreeDeeRender/ThreeDeeRender.tsx index 99fe1eebf88..3ca35ca2ad5 100644 --- a/packages/studio-base/src/panels/ThreeDeeRender/ThreeDeeRender.tsx +++ b/packages/studio-base/src/panels/ThreeDeeRender/ThreeDeeRender.tsx @@ -3,6 +3,14 @@ // file, You can obtain one at http://mozilla.org/MPL/2.0/ import Logger from "@lichtblick/log"; +import { AppSetting } from "@lichtblick/studio-base/AppSetting"; +import { BuiltinPanelExtensionContext } from "@lichtblick/studio-base/components/PanelExtensionAdapter"; +import { useAnalytics } from "@lichtblick/studio-base/context/AnalyticsContext"; +import { + DEFAULT_SCENE_EXTENSION_CONFIG, + SceneExtensionConfig, +} from "@lichtblick/studio-base/panels/ThreeDeeRender/SceneExtensionConfig"; +import ThemeProvider from "@lichtblick/studio-base/theme/ThemeProvider"; import { Immutable, LayoutActions, @@ -13,15 +21,7 @@ import { SettingsTreeNodes, Subscription, Topic, -} from "@lichtblick/studio"; -import { AppSetting } from "@lichtblick/studio-base/AppSetting"; -import { BuiltinPanelExtensionContext } from "@lichtblick/studio-base/components/PanelExtensionAdapter"; -import { useAnalytics } from "@lichtblick/studio-base/context/AnalyticsContext"; -import { - DEFAULT_SCENE_EXTENSION_CONFIG, - SceneExtensionConfig, -} from "@lichtblick/studio-base/panels/ThreeDeeRender/SceneExtensionConfig"; -import ThemeProvider from "@lichtblick/studio-base/theme/ThemeProvider"; +} from "@lichtblick/suite"; import * as _ from "lodash-es"; import { useSnackbar } from "notistack"; import React, { useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState } from "react"; diff --git a/packages/studio-base/src/panels/ThreeDeeRender/renderables/CameraStateSettings.ts b/packages/studio-base/src/panels/ThreeDeeRender/renderables/CameraStateSettings.ts index 8ff7243a5e2..fccb928fe23 100644 --- a/packages/studio-base/src/panels/ThreeDeeRender/renderables/CameraStateSettings.ts +++ b/packages/studio-base/src/panels/ThreeDeeRender/renderables/CameraStateSettings.ts @@ -2,7 +2,6 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { SettingsTreeAction } from "@lichtblick/studio"; import { ICameraHandler } from "@lichtblick/studio-base/panels/ThreeDeeRender/renderables/ICameraHandler"; import { AnyFrameId, @@ -11,6 +10,7 @@ import { UserFrameId, makePose, } from "@lichtblick/studio-base/panels/ThreeDeeRender/transforms"; +import { SettingsTreeAction } from "@lichtblick/suite"; import { t } from "i18next"; import * as _ from "lodash-es"; import * as THREE from "three"; diff --git a/packages/studio-base/src/panels/ThreeDeeRender/renderables/Cameras.ts b/packages/studio-base/src/panels/ThreeDeeRender/renderables/Cameras.ts index 603f1f2b6f0..5d58c351ee3 100644 --- a/packages/studio-base/src/panels/ThreeDeeRender/renderables/Cameras.ts +++ b/packages/studio-base/src/panels/ThreeDeeRender/renderables/Cameras.ts @@ -4,8 +4,8 @@ import { PinholeCameraModel } from "@lichtblick/den/image"; import Logger from "@lichtblick/log"; -import { SettingsTreeAction, SettingsTreeFields } from "@lichtblick/studio"; import type { RosValue } from "@lichtblick/studio-base/players/types"; +import { SettingsTreeAction, SettingsTreeFields } from "@lichtblick/suite"; import { t } from "i18next"; import { toNanoSec } from "@foxglove/rostime"; diff --git a/packages/studio-base/src/panels/ThreeDeeRender/renderables/FoxgloveGrid.ts b/packages/studio-base/src/panels/ThreeDeeRender/renderables/FoxgloveGrid.ts index cecd731f763..02317ee5bc0 100644 --- a/packages/studio-base/src/panels/ThreeDeeRender/renderables/FoxgloveGrid.ts +++ b/packages/studio-base/src/panels/ThreeDeeRender/renderables/FoxgloveGrid.ts @@ -2,9 +2,9 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { SettingsTreeAction } from "@lichtblick/studio"; import { GRID_DATATYPES } from "@lichtblick/studio-base/panels/ThreeDeeRender/foxglove"; import type { RosValue } from "@lichtblick/studio-base/players/types"; +import { SettingsTreeAction } from "@lichtblick/suite"; import * as THREE from "three"; import { toNanoSec } from "@foxglove/rostime"; diff --git a/packages/studio-base/src/panels/ThreeDeeRender/renderables/FrameAxes.ts b/packages/studio-base/src/panels/ThreeDeeRender/renderables/FrameAxes.ts index ea7e68567d2..521a7d10bdd 100644 --- a/packages/studio-base/src/panels/ThreeDeeRender/renderables/FrameAxes.ts +++ b/packages/studio-base/src/panels/ThreeDeeRender/renderables/FrameAxes.ts @@ -2,13 +2,13 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ +import type { RosValue } from "@lichtblick/studio-base/players/types"; import { Immutable, SettingsTreeAction, SettingsTreeChildren, SettingsTreeFields, -} from "@lichtblick/studio"; -import type { RosValue } from "@lichtblick/studio-base/players/types"; +} from "@lichtblick/suite"; import { t } from "i18next"; import * as _ from "lodash-es"; import * as THREE from "three"; diff --git a/packages/studio-base/src/panels/ThreeDeeRender/renderables/Grids.ts b/packages/studio-base/src/panels/ThreeDeeRender/renderables/Grids.ts index 22c331f844a..774b6e1f4d9 100644 --- a/packages/studio-base/src/panels/ThreeDeeRender/renderables/Grids.ts +++ b/packages/studio-base/src/panels/ThreeDeeRender/renderables/Grids.ts @@ -3,7 +3,7 @@ // file, You can obtain one at http://mozilla.org/MPL/2.0/ import Logger from "@lichtblick/log"; -import { SettingsTreeAction, SettingsTreeFields } from "@lichtblick/studio"; +import { SettingsTreeAction, SettingsTreeFields } from "@lichtblick/suite"; import { t } from "i18next"; import * as _ from "lodash-es"; diff --git a/packages/studio-base/src/panels/ThreeDeeRender/renderables/ImageMode/ImageMode.ts b/packages/studio-base/src/panels/ThreeDeeRender/renderables/ImageMode/ImageMode.ts index c2e3f754f4f..65b39d2de06 100644 --- a/packages/studio-base/src/panels/ThreeDeeRender/renderables/ImageMode/ImageMode.ts +++ b/packages/studio-base/src/panels/ThreeDeeRender/renderables/ImageMode/ImageMode.ts @@ -5,13 +5,6 @@ import { filterMap } from "@lichtblick/den/collection"; import { PinholeCameraModel } from "@lichtblick/den/image"; import Logger from "@lichtblick/log"; -import { - Immutable, - MessageEvent, - SettingsTreeAction, - SettingsTreeFields, - Topic, -} from "@lichtblick/studio"; import { PanelContextMenuItem } from "@lichtblick/studio-base/components/PanelContextMenu"; import { DraggedMessagePath } from "@lichtblick/studio-base/components/PanelExtensionAdapter"; import { HUDItem } from "@lichtblick/studio-base/panels/ThreeDeeRender/HUDItemManager"; @@ -39,6 +32,13 @@ import { t3D } from "@lichtblick/studio-base/panels/ThreeDeeRender/t3D"; import { makePose } from "@lichtblick/studio-base/panels/ThreeDeeRender/transforms"; import { AppEvent } from "@lichtblick/studio-base/services/IAnalytics"; import { downloadFiles } from "@lichtblick/studio-base/util/download"; +import { + Immutable, + MessageEvent, + SettingsTreeAction, + SettingsTreeFields, + Topic, +} from "@lichtblick/suite"; import * as _ from "lodash-es"; import * as THREE from "three"; import { Writable } from "ts-essentials"; diff --git a/packages/studio-base/src/panels/ThreeDeeRender/renderables/ImageMode/MessageHandler.test.ts b/packages/studio-base/src/panels/ThreeDeeRender/renderables/ImageMode/MessageHandler.test.ts index 854eecb103f..de08a16ab13 100644 --- a/packages/studio-base/src/panels/ThreeDeeRender/renderables/ImageMode/MessageHandler.test.ts +++ b/packages/studio-base/src/panels/ThreeDeeRender/renderables/ImageMode/MessageHandler.test.ts @@ -2,7 +2,6 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { MessageEvent } from "@lichtblick/studio"; import { HUDItemManager } from "@lichtblick/studio-base/panels/ThreeDeeRender/HUDItemManager"; import { MessageHandler, @@ -13,6 +12,7 @@ import { WAITING_FOR_SYNC_EMPTY_HUD_ITEM, WAITING_FOR_SYNC_NOTICE_HUD_ITEM, } from "@lichtblick/studio-base/panels/ThreeDeeRender/renderables/ImageMode/MessageHandler"; +import { MessageEvent } from "@lichtblick/suite"; import * as _ from "lodash-es"; import { DeepPartial } from "ts-essentials"; diff --git a/packages/studio-base/src/panels/ThreeDeeRender/renderables/ImageMode/MessageHandler.ts b/packages/studio-base/src/panels/ThreeDeeRender/renderables/ImageMode/MessageHandler.ts index 2886cec80a3..847b0de01af 100644 --- a/packages/studio-base/src/panels/ThreeDeeRender/renderables/ImageMode/MessageHandler.ts +++ b/packages/studio-base/src/panels/ThreeDeeRender/renderables/ImageMode/MessageHandler.ts @@ -2,7 +2,6 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { Immutable, MessageEvent } from "@lichtblick/studio"; import { HUDItem, HUDItemManager, @@ -23,6 +22,7 @@ import { ImageMarker as RosImageMarker, ImageMarkerArray as RosImageMarkerArray, } from "@lichtblick/studio-base/types/Messages"; +import { Immutable, MessageEvent } from "@lichtblick/suite"; import * as _ from "lodash-es"; import { AVLTree } from "@foxglove/avl"; diff --git a/packages/studio-base/src/panels/ThreeDeeRender/renderables/ImageMode/annotations/ImageAnnotations.ts b/packages/studio-base/src/panels/ThreeDeeRender/renderables/ImageMode/annotations/ImageAnnotations.ts index 707516fa805..7316059778a 100644 --- a/packages/studio-base/src/panels/ThreeDeeRender/renderables/ImageMode/annotations/ImageAnnotations.ts +++ b/packages/studio-base/src/panels/ThreeDeeRender/renderables/ImageMode/annotations/ImageAnnotations.ts @@ -4,13 +4,13 @@ import { filterMap } from "@lichtblick/den/collection"; import { PinholeCameraModel } from "@lichtblick/den/image"; -import { Immutable, MessageEvent, SettingsTreeAction, Topic } from "@lichtblick/studio"; import { Path } from "@lichtblick/studio-base/panels/ThreeDeeRender/LayerErrors"; import { onlyLastByTopicMessage } from "@lichtblick/studio-base/panels/ThreeDeeRender/SceneExtension"; import { ImageMarker as RosImageMarker, ImageMarkerArray as RosImageMarkerArray, } from "@lichtblick/studio-base/types/Messages"; +import { Immutable, MessageEvent, SettingsTreeAction, Topic } from "@lichtblick/suite"; import { t } from "i18next"; import * as THREE from "three"; import { Opaque } from "ts-essentials"; diff --git a/packages/studio-base/src/panels/ThreeDeeRender/renderables/Images.ts b/packages/studio-base/src/panels/ThreeDeeRender/renderables/Images.ts index 313c90bc98b..43c330145cb 100644 --- a/packages/studio-base/src/panels/ThreeDeeRender/renderables/Images.ts +++ b/packages/studio-base/src/panels/ThreeDeeRender/renderables/Images.ts @@ -5,8 +5,8 @@ import { MultiMap, filterMap } from "@lichtblick/den/collection"; import { PinholeCameraModel } from "@lichtblick/den/image"; import Logger from "@lichtblick/log"; -import { SettingsTreeAction, SettingsTreeFields } from "@lichtblick/studio"; import { ALL_SUPPORTED_IMAGE_SCHEMAS } from "@lichtblick/studio-base/panels/ThreeDeeRender/renderables/ImageMode/ImageMode"; +import { SettingsTreeAction, SettingsTreeFields } from "@lichtblick/suite"; import { t } from "i18next"; import { assert } from "ts-essentials"; diff --git a/packages/studio-base/src/panels/ThreeDeeRender/renderables/LaserScans.ts b/packages/studio-base/src/panels/ThreeDeeRender/renderables/LaserScans.ts index 63473d450f0..06eee283d16 100644 --- a/packages/studio-base/src/panels/ThreeDeeRender/renderables/LaserScans.ts +++ b/packages/studio-base/src/panels/ThreeDeeRender/renderables/LaserScans.ts @@ -2,7 +2,6 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { SettingsTreeAction, MessageEvent } from "@lichtblick/studio"; import { DEFAULT_POINT_SETTINGS, LayerSettingsPointExtension, @@ -12,6 +11,7 @@ import { } from "@lichtblick/studio-base/panels/ThreeDeeRender/renderables/pointExtensionUtils"; import type { RosObject, RosValue } from "@lichtblick/studio-base/players/types"; import { emptyPose } from "@lichtblick/studio-base/util/Pose"; +import { SettingsTreeAction, MessageEvent } from "@lichtblick/suite"; import * as _ from "lodash-es"; import * as THREE from "three"; diff --git a/packages/studio-base/src/panels/ThreeDeeRender/renderables/Markers.ts b/packages/studio-base/src/panels/ThreeDeeRender/renderables/Markers.ts index 12030263470..44829184b8c 100644 --- a/packages/studio-base/src/panels/ThreeDeeRender/renderables/Markers.ts +++ b/packages/studio-base/src/panels/ThreeDeeRender/renderables/Markers.ts @@ -2,7 +2,7 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { SettingsTreeAction } from "@lichtblick/studio"; +import { SettingsTreeAction } from "@lichtblick/suite"; import { t } from "i18next"; import * as _ from "lodash-es"; diff --git a/packages/studio-base/src/panels/ThreeDeeRender/renderables/OccupancyGrids.ts b/packages/studio-base/src/panels/ThreeDeeRender/renderables/OccupancyGrids.ts index 566eb475dd6..b0f6f83227e 100644 --- a/packages/studio-base/src/panels/ThreeDeeRender/renderables/OccupancyGrids.ts +++ b/packages/studio-base/src/panels/ThreeDeeRender/renderables/OccupancyGrids.ts @@ -2,8 +2,8 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { SettingsTreeAction, SettingsTreeFields } from "@lichtblick/studio"; import type { RosValue } from "@lichtblick/studio-base/players/types"; +import { SettingsTreeAction, SettingsTreeFields } from "@lichtblick/suite"; import { t } from "i18next"; import * as THREE from "three"; diff --git a/packages/studio-base/src/panels/ThreeDeeRender/renderables/PointClouds.ts b/packages/studio-base/src/panels/ThreeDeeRender/renderables/PointClouds.ts index 1173bd309c8..2683be2f4ef 100644 --- a/packages/studio-base/src/panels/ThreeDeeRender/renderables/PointClouds.ts +++ b/packages/studio-base/src/panels/ThreeDeeRender/renderables/PointClouds.ts @@ -2,7 +2,6 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { SettingsTreeAction, MessageEvent } from "@lichtblick/studio"; import { DynamicBufferGeometry } from "@lichtblick/studio-base/panels/ThreeDeeRender/DynamicBufferGeometry"; import { createGeometry, @@ -18,6 +17,7 @@ import { PointsRenderable, } from "@lichtblick/studio-base/panels/ThreeDeeRender/renderables/pointExtensionUtils"; import type { RosObject, RosValue } from "@lichtblick/studio-base/players/types"; +import { SettingsTreeAction, MessageEvent } from "@lichtblick/suite"; import * as _ from "lodash-es"; import * as THREE from "three"; diff --git a/packages/studio-base/src/panels/ThreeDeeRender/renderables/Polygons.ts b/packages/studio-base/src/panels/ThreeDeeRender/renderables/Polygons.ts index 4e8b8d0de88..7c89cbbd9be 100644 --- a/packages/studio-base/src/panels/ThreeDeeRender/renderables/Polygons.ts +++ b/packages/studio-base/src/panels/ThreeDeeRender/renderables/Polygons.ts @@ -2,8 +2,8 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { SettingsTreeAction, SettingsTreeFields } from "@lichtblick/studio"; import type { RosValue } from "@lichtblick/studio-base/players/types"; +import { SettingsTreeAction, SettingsTreeFields } from "@lichtblick/suite"; import { toNanoSec } from "@foxglove/rostime"; diff --git a/packages/studio-base/src/panels/ThreeDeeRender/renderables/PoseArrays.ts b/packages/studio-base/src/panels/ThreeDeeRender/renderables/PoseArrays.ts index bef64abb8c6..f65b58e79f7 100644 --- a/packages/studio-base/src/panels/ThreeDeeRender/renderables/PoseArrays.ts +++ b/packages/studio-base/src/panels/ThreeDeeRender/renderables/PoseArrays.ts @@ -2,8 +2,8 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { SettingsTreeAction, SettingsTreeFields, Topic } from "@lichtblick/studio"; import type { RosValue } from "@lichtblick/studio-base/players/types"; +import { SettingsTreeAction, SettingsTreeFields, Topic } from "@lichtblick/suite"; import { t } from "i18next"; import * as _ from "lodash-es"; import * as THREE from "three"; diff --git a/packages/studio-base/src/panels/ThreeDeeRender/renderables/Poses.ts b/packages/studio-base/src/panels/ThreeDeeRender/renderables/Poses.ts index e6a2e06012a..4739287ee77 100644 --- a/packages/studio-base/src/panels/ThreeDeeRender/renderables/Poses.ts +++ b/packages/studio-base/src/panels/ThreeDeeRender/renderables/Poses.ts @@ -2,8 +2,8 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { SettingsTreeAction, SettingsTreeFields } from "@lichtblick/studio"; import type { RosValue } from "@lichtblick/studio-base/players/types"; +import { SettingsTreeAction, SettingsTreeFields } from "@lichtblick/suite"; import { t } from "i18next"; import * as _ from "lodash-es"; import * as THREE from "three"; diff --git a/packages/studio-base/src/panels/ThreeDeeRender/renderables/PublishSettings.ts b/packages/studio-base/src/panels/ThreeDeeRender/renderables/PublishSettings.ts index 1c6e8dd7c0a..9cf6ddb549f 100644 --- a/packages/studio-base/src/panels/ThreeDeeRender/renderables/PublishSettings.ts +++ b/packages/studio-base/src/panels/ThreeDeeRender/renderables/PublishSettings.ts @@ -2,7 +2,7 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { SettingsTreeAction } from "@lichtblick/studio"; +import { SettingsTreeAction } from "@lichtblick/suite"; import { t } from "i18next"; import * as _ from "lodash-es"; diff --git a/packages/studio-base/src/panels/ThreeDeeRender/renderables/SceneEntities.ts b/packages/studio-base/src/panels/ThreeDeeRender/renderables/SceneEntities.ts index 817c7560b08..43a919139cd 100644 --- a/packages/studio-base/src/panels/ThreeDeeRender/renderables/SceneEntities.ts +++ b/packages/studio-base/src/panels/ThreeDeeRender/renderables/SceneEntities.ts @@ -2,7 +2,7 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { SettingsTreeAction } from "@lichtblick/studio"; +import { SettingsTreeAction } from "@lichtblick/suite"; import { toNanoSec } from "@foxglove/rostime"; import { diff --git a/packages/studio-base/src/panels/ThreeDeeRender/renderables/SceneSettings.ts b/packages/studio-base/src/panels/ThreeDeeRender/renderables/SceneSettings.ts index 298b95bc582..c4995bab66d 100644 --- a/packages/studio-base/src/panels/ThreeDeeRender/renderables/SceneSettings.ts +++ b/packages/studio-base/src/panels/ThreeDeeRender/renderables/SceneSettings.ts @@ -2,7 +2,7 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { SettingsTreeAction, SettingsTreeFields } from "@lichtblick/studio"; +import { SettingsTreeAction, SettingsTreeFields } from "@lichtblick/suite"; import { t } from "i18next"; import * as _ from "lodash-es"; diff --git a/packages/studio-base/src/panels/ThreeDeeRender/renderables/Urdfs.ts b/packages/studio-base/src/panels/ThreeDeeRender/renderables/Urdfs.ts index e81fb7cc62a..5e196f1bbcd 100644 --- a/packages/studio-base/src/panels/ThreeDeeRender/renderables/Urdfs.ts +++ b/packages/studio-base/src/panels/ThreeDeeRender/renderables/Urdfs.ts @@ -11,15 +11,15 @@ import { UrdfJoint, } from "@lichtblick/den/urdf"; import Logger from "@lichtblick/log"; +import { makeRgba, stringToRgba } from "@lichtblick/studio-base/panels/ThreeDeeRender/color"; +import { eulerToQuaternion } from "@lichtblick/studio-base/util/geometry"; +import isDesktopApp from "@lichtblick/studio-base/util/isDesktopApp"; import { SettingsTreeAction, SettingsTreeChildren, SettingsTreeField, SettingsTreeFields, -} from "@lichtblick/studio"; -import { makeRgba, stringToRgba } from "@lichtblick/studio-base/panels/ThreeDeeRender/color"; -import { eulerToQuaternion } from "@lichtblick/studio-base/util/geometry"; -import isDesktopApp from "@lichtblick/studio-base/util/isDesktopApp"; +} from "@lichtblick/suite"; import { vec3 } from "gl-matrix"; import i18next from "i18next"; import * as _ from "lodash-es"; diff --git a/packages/studio-base/src/panels/ThreeDeeRender/renderables/VelodyneScans.ts b/packages/studio-base/src/panels/ThreeDeeRender/renderables/VelodyneScans.ts index 51deaf2e27d..8b8160b931e 100644 --- a/packages/studio-base/src/panels/ThreeDeeRender/renderables/VelodyneScans.ts +++ b/packages/studio-base/src/panels/ThreeDeeRender/renderables/VelodyneScans.ts @@ -2,13 +2,13 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { MessageEvent, SettingsTreeAction } from "@lichtblick/studio"; import { createStixelMaterial, PointCloudHistoryRenderable, } from "@lichtblick/studio-base/panels/ThreeDeeRender/renderables/PointClouds"; import type { RosObject } from "@lichtblick/studio-base/players/types"; import { VelodyneScan } from "@lichtblick/studio-base/types/Messages"; +import { MessageEvent, SettingsTreeAction } from "@lichtblick/suite"; import * as _ from "lodash-es"; import { toNanoSec, toSec } from "@foxglove/rostime"; diff --git a/packages/studio-base/src/panels/ThreeDeeRender/renderables/colorMode.ts b/packages/studio-base/src/panels/ThreeDeeRender/renderables/colorMode.ts index b2ef0d6034d..f641e3de58d 100644 --- a/packages/studio-base/src/panels/ThreeDeeRender/renderables/colorMode.ts +++ b/packages/studio-base/src/panels/ThreeDeeRender/renderables/colorMode.ts @@ -2,8 +2,8 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { SettingsTreeFields, SettingsTreeNode } from "@lichtblick/studio"; import { BaseSettings } from "@lichtblick/studio-base/panels/ThreeDeeRender/settings"; +import { SettingsTreeFields, SettingsTreeNode } from "@lichtblick/suite"; import { t } from "i18next"; import * as THREE from "three"; diff --git a/packages/studio-base/src/panels/ThreeDeeRender/renderables/pointExtensionUtils.ts b/packages/studio-base/src/panels/ThreeDeeRender/renderables/pointExtensionUtils.ts index 61e4a65a754..27b16a8d5dd 100644 --- a/packages/studio-base/src/panels/ThreeDeeRender/renderables/pointExtensionUtils.ts +++ b/packages/studio-base/src/panels/ThreeDeeRender/renderables/pointExtensionUtils.ts @@ -2,7 +2,6 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { SettingsTreeNode, Topic } from "@lichtblick/studio"; import { DynamicBufferGeometry } from "@lichtblick/studio-base/panels/ThreeDeeRender/DynamicBufferGeometry"; import { IRenderer } from "@lichtblick/studio-base/panels/ThreeDeeRender/IRenderer"; import { BaseUserData, Renderable } from "@lichtblick/studio-base/panels/ThreeDeeRender/Renderable"; @@ -14,6 +13,7 @@ import { import { BaseSettings } from "@lichtblick/studio-base/panels/ThreeDeeRender/settings"; import { MAX_DURATION } from "@lichtblick/studio-base/panels/ThreeDeeRender/transforms"; import { updatePose } from "@lichtblick/studio-base/panels/ThreeDeeRender/updatePose"; +import { SettingsTreeNode, Topic } from "@lichtblick/suite"; import { t } from "i18next"; import * as THREE from "three"; diff --git a/packages/studio-base/src/panels/ThreeDeeRender/settings.ts b/packages/studio-base/src/panels/ThreeDeeRender/settings.ts index 7eab3554dbd..f6e747022f1 100644 --- a/packages/studio-base/src/panels/ThreeDeeRender/settings.ts +++ b/packages/studio-base/src/panels/ThreeDeeRender/settings.ts @@ -2,7 +2,7 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import type { SettingsTreeField } from "@lichtblick/studio"; +import type { SettingsTreeField } from "@lichtblick/suite"; export type SelectEntry = { label: string; value: string }; diff --git a/packages/studio-base/src/panels/ThreeDeeRender/stories/ArrowMarkers.stories.tsx b/packages/studio-base/src/panels/ThreeDeeRender/stories/ArrowMarkers.stories.tsx index 88d2042e074..abc86e0c69f 100644 --- a/packages/studio-base/src/panels/ThreeDeeRender/stories/ArrowMarkers.stories.tsx +++ b/packages/studio-base/src/panels/ThreeDeeRender/stories/ArrowMarkers.stories.tsx @@ -2,9 +2,9 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { MessageEvent } from "@lichtblick/studio"; import { Topic } from "@lichtblick/studio-base/players/types"; import PanelSetup from "@lichtblick/studio-base/stories/PanelSetup"; +import { MessageEvent } from "@lichtblick/suite"; import { StoryObj } from "@storybook/react"; import { diff --git a/packages/studio-base/src/panels/ThreeDeeRender/stories/AutoSelectFrame.stories.tsx b/packages/studio-base/src/panels/ThreeDeeRender/stories/AutoSelectFrame.stories.tsx index 894b436ba77..3c3526c2e52 100644 --- a/packages/studio-base/src/panels/ThreeDeeRender/stories/AutoSelectFrame.stories.tsx +++ b/packages/studio-base/src/panels/ThreeDeeRender/stories/AutoSelectFrame.stories.tsx @@ -2,9 +2,9 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { MessageEvent } from "@lichtblick/studio"; import { Topic } from "@lichtblick/studio-base/players/types"; import PanelSetup from "@lichtblick/studio-base/stories/PanelSetup"; +import { MessageEvent } from "@lichtblick/suite"; import { StoryObj } from "@storybook/react"; import { diff --git a/packages/studio-base/src/panels/ThreeDeeRender/stories/CameraInfoRender.stories.tsx b/packages/studio-base/src/panels/ThreeDeeRender/stories/CameraInfoRender.stories.tsx index d77a88bfe83..43d33b9b9c9 100644 --- a/packages/studio-base/src/panels/ThreeDeeRender/stories/CameraInfoRender.stories.tsx +++ b/packages/studio-base/src/panels/ThreeDeeRender/stories/CameraInfoRender.stories.tsx @@ -2,9 +2,9 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { MessageEvent } from "@lichtblick/studio"; import { Topic } from "@lichtblick/studio-base/players/types"; import PanelSetup from "@lichtblick/studio-base/stories/PanelSetup"; +import { MessageEvent } from "@lichtblick/suite"; import { StoryObj } from "@storybook/react"; import { screen, userEvent } from "@storybook/testing-library"; diff --git a/packages/studio-base/src/panels/ThreeDeeRender/stories/ColladaUpAxis.stories.tsx b/packages/studio-base/src/panels/ThreeDeeRender/stories/ColladaUpAxis.stories.tsx index 54d3f476473..ec3fac6bd87 100644 --- a/packages/studio-base/src/panels/ThreeDeeRender/stories/ColladaUpAxis.stories.tsx +++ b/packages/studio-base/src/panels/ThreeDeeRender/stories/ColladaUpAxis.stories.tsx @@ -2,9 +2,9 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { MessageEvent } from "@lichtblick/studio"; import { Topic } from "@lichtblick/studio-base/players/types"; import PanelSetup from "@lichtblick/studio-base/stories/PanelSetup"; +import { MessageEvent } from "@lichtblick/suite"; import { StoryObj } from "@storybook/react"; import { COLLADA_CONE_Y_UP_MESH_RESOURCE, COLLADA_CONE_Z_UP_MESH_RESOURCE } from "./common"; diff --git a/packages/studio-base/src/panels/ThreeDeeRender/stories/EditableTransform.stories.tsx b/packages/studio-base/src/panels/ThreeDeeRender/stories/EditableTransform.stories.tsx index 375457346d5..051e11acfb7 100644 --- a/packages/studio-base/src/panels/ThreeDeeRender/stories/EditableTransform.stories.tsx +++ b/packages/studio-base/src/panels/ThreeDeeRender/stories/EditableTransform.stories.tsx @@ -2,10 +2,10 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { MessageEvent } from "@lichtblick/studio"; import { Topic } from "@lichtblick/studio-base/players/types"; import PanelSetup from "@lichtblick/studio-base/stories/PanelSetup"; import { eulerToQuaternion } from "@lichtblick/studio-base/util/geometry"; +import { MessageEvent } from "@lichtblick/suite"; import { StoryObj } from "@storybook/react"; import type { FrameTransform } from "@foxglove/schemas"; diff --git a/packages/studio-base/src/panels/ThreeDeeRender/stories/FramelessMarkers.stories.tsx b/packages/studio-base/src/panels/ThreeDeeRender/stories/FramelessMarkers.stories.tsx index 57001e82d6c..6e68fb6be42 100644 --- a/packages/studio-base/src/panels/ThreeDeeRender/stories/FramelessMarkers.stories.tsx +++ b/packages/studio-base/src/panels/ThreeDeeRender/stories/FramelessMarkers.stories.tsx @@ -2,9 +2,9 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { MessageEvent } from "@lichtblick/studio"; import { Topic } from "@lichtblick/studio-base/players/types"; import PanelSetup from "@lichtblick/studio-base/stories/PanelSetup"; +import { MessageEvent } from "@lichtblick/suite"; import { StoryObj } from "@storybook/react"; import { makeColor, rad2deg, TEST_COLORS } from "./common"; diff --git a/packages/studio-base/src/panels/ThreeDeeRender/stories/GeometryMsgs_Polygon.stories.tsx b/packages/studio-base/src/panels/ThreeDeeRender/stories/GeometryMsgs_Polygon.stories.tsx index 6bb26cb0f1d..4f540594062 100644 --- a/packages/studio-base/src/panels/ThreeDeeRender/stories/GeometryMsgs_Polygon.stories.tsx +++ b/packages/studio-base/src/panels/ThreeDeeRender/stories/GeometryMsgs_Polygon.stories.tsx @@ -2,9 +2,9 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { MessageEvent } from "@lichtblick/studio"; import { Topic } from "@lichtblick/studio-base/players/types"; import PanelSetup from "@lichtblick/studio-base/stories/PanelSetup"; +import { MessageEvent } from "@lichtblick/suite"; import { StoryObj } from "@storybook/react"; import { QUAT_IDENTITY, rad2deg } from "./common"; diff --git a/packages/studio-base/src/panels/ThreeDeeRender/stories/GeometryMsgs_PoseArray.stories.tsx b/packages/studio-base/src/panels/ThreeDeeRender/stories/GeometryMsgs_PoseArray.stories.tsx index 3901ee503bf..5adccf09157 100644 --- a/packages/studio-base/src/panels/ThreeDeeRender/stories/GeometryMsgs_PoseArray.stories.tsx +++ b/packages/studio-base/src/panels/ThreeDeeRender/stories/GeometryMsgs_PoseArray.stories.tsx @@ -2,9 +2,9 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { MessageEvent } from "@lichtblick/studio"; import { Topic } from "@lichtblick/studio-base/players/types"; import PanelSetup from "@lichtblick/studio-base/stories/PanelSetup"; +import { MessageEvent } from "@lichtblick/suite"; import { StoryObj } from "@storybook/react"; import { quat } from "gl-matrix"; diff --git a/packages/studio-base/src/panels/ThreeDeeRender/stories/GeometryMsgs_PoseStamped.stories.tsx b/packages/studio-base/src/panels/ThreeDeeRender/stories/GeometryMsgs_PoseStamped.stories.tsx index 7ce3180c9ab..0bff6b960d1 100644 --- a/packages/studio-base/src/panels/ThreeDeeRender/stories/GeometryMsgs_PoseStamped.stories.tsx +++ b/packages/studio-base/src/panels/ThreeDeeRender/stories/GeometryMsgs_PoseStamped.stories.tsx @@ -2,9 +2,9 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { MessageEvent } from "@lichtblick/studio"; import { Topic } from "@lichtblick/studio-base/players/types"; import PanelSetup from "@lichtblick/studio-base/stories/PanelSetup"; +import { MessageEvent } from "@lichtblick/suite"; import { StoryObj } from "@storybook/react"; import { quat } from "gl-matrix"; diff --git a/packages/studio-base/src/panels/ThreeDeeRender/stories/ImageMode/ImageAnnotations.stories.tsx b/packages/studio-base/src/panels/ThreeDeeRender/stories/ImageMode/ImageAnnotations.stories.tsx index c790bc7a4ab..6ef5b58b92a 100644 --- a/packages/studio-base/src/panels/ThreeDeeRender/stories/ImageMode/ImageAnnotations.stories.tsx +++ b/packages/studio-base/src/panels/ThreeDeeRender/stories/ImageMode/ImageAnnotations.stories.tsx @@ -2,12 +2,12 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { MessageEvent } from "@lichtblick/studio"; import { ImageModeConfig } from "@lichtblick/studio-base/panels/ThreeDeeRender/IRenderer"; import { makeRawImageAndCalibration } from "@lichtblick/studio-base/panels/ThreeDeeRender/stories/ImageMode/imageCommon"; import PanelSetup, { Fixture } from "@lichtblick/studio-base/stories/PanelSetup"; import { useReadySignal } from "@lichtblick/studio-base/stories/ReadySignalContext"; import delay from "@lichtblick/studio-base/util/delay"; +import { MessageEvent } from "@lichtblick/suite"; import { StoryObj } from "@storybook/react"; import { screen, userEvent } from "@storybook/testing-library"; import * as _ from "lodash-es"; diff --git a/packages/studio-base/src/panels/ThreeDeeRender/stories/ImageMode/ImageMode.stories.tsx b/packages/studio-base/src/panels/ThreeDeeRender/stories/ImageMode/ImageMode.stories.tsx index 24668141de4..c3ce329ec59 100644 --- a/packages/studio-base/src/panels/ThreeDeeRender/stories/ImageMode/ImageMode.stories.tsx +++ b/packages/studio-base/src/panels/ThreeDeeRender/stories/ImageMode/ImageMode.stories.tsx @@ -2,7 +2,6 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { MessageEvent } from "@lichtblick/studio"; import Stack from "@lichtblick/studio-base/components/Stack"; import { makeCompressedImageAndCalibration, @@ -11,6 +10,7 @@ import { import { Topic } from "@lichtblick/studio-base/players/types"; import PanelSetup, { Fixture } from "@lichtblick/studio-base/stories/PanelSetup"; import delay from "@lichtblick/studio-base/util/delay"; +import { MessageEvent } from "@lichtblick/suite"; import { Meta, StoryObj } from "@storybook/react"; import { fireEvent, screen, userEvent, waitFor } from "@storybook/testing-library"; import { useCallback, useMemo, useState } from "react"; diff --git a/packages/studio-base/src/panels/ThreeDeeRender/stories/ImageMode/ImageOnlyMode.stories.tsx b/packages/studio-base/src/panels/ThreeDeeRender/stories/ImageMode/ImageOnlyMode.stories.tsx index 8633c20caaf..a1becc9bfde 100644 --- a/packages/studio-base/src/panels/ThreeDeeRender/stories/ImageMode/ImageOnlyMode.stories.tsx +++ b/packages/studio-base/src/panels/ThreeDeeRender/stories/ImageMode/ImageOnlyMode.stories.tsx @@ -2,12 +2,12 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { MessageEvent } from "@lichtblick/studio"; import { ImageModeConfig } from "@lichtblick/studio-base/panels/ThreeDeeRender/IRenderer"; import { makeRawImageAndCalibration } from "@lichtblick/studio-base/panels/ThreeDeeRender/stories/ImageMode/imageCommon"; import { xyzrpyToPose } from "@lichtblick/studio-base/panels/ThreeDeeRender/transforms"; import { Topic } from "@lichtblick/studio-base/players/types"; import PanelSetup, { Fixture } from "@lichtblick/studio-base/stories/PanelSetup"; +import { MessageEvent } from "@lichtblick/suite"; import { StoryObj } from "@storybook/react"; import { screen, userEvent, within } from "@storybook/testing-library"; import tinycolor from "tinycolor2"; diff --git a/packages/studio-base/src/panels/ThreeDeeRender/stories/ImageMode/ImagePanZoomRotate.stories.tsx b/packages/studio-base/src/panels/ThreeDeeRender/stories/ImageMode/ImagePanZoomRotate.stories.tsx index 7cd4c11df2d..f82a210e8f2 100644 --- a/packages/studio-base/src/panels/ThreeDeeRender/stories/ImageMode/ImagePanZoomRotate.stories.tsx +++ b/packages/studio-base/src/panels/ThreeDeeRender/stories/ImageMode/ImagePanZoomRotate.stories.tsx @@ -2,9 +2,9 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { MessageEvent } from "@lichtblick/studio"; import { makeRawImageAndCalibration } from "@lichtblick/studio-base/panels/ThreeDeeRender/stories/ImageMode/imageCommon"; import PanelSetup, { Fixture } from "@lichtblick/studio-base/stories/PanelSetup"; +import { MessageEvent } from "@lichtblick/suite"; import { StoryObj } from "@storybook/react"; import { fireEvent } from "@storybook/testing-library"; import * as THREE from "three"; diff --git a/packages/studio-base/src/panels/ThreeDeeRender/stories/ImageMode/imageCommon.ts b/packages/studio-base/src/panels/ThreeDeeRender/stories/ImageMode/imageCommon.ts index ceafab2ee8d..77970654c82 100644 --- a/packages/studio-base/src/panels/ThreeDeeRender/stories/ImageMode/imageCommon.ts +++ b/packages/studio-base/src/panels/ThreeDeeRender/stories/ImageMode/imageCommon.ts @@ -2,7 +2,7 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { MessageEvent } from "@lichtblick/studio"; +import { MessageEvent } from "@lichtblick/suite"; import { CameraCalibration, CompressedImage, RawImage } from "@foxglove/schemas"; diff --git a/packages/studio-base/src/panels/ThreeDeeRender/stories/ImageRender.stories.tsx b/packages/studio-base/src/panels/ThreeDeeRender/stories/ImageRender.stories.tsx index 0acf558e061..8b309d742ec 100644 --- a/packages/studio-base/src/panels/ThreeDeeRender/stories/ImageRender.stories.tsx +++ b/packages/studio-base/src/panels/ThreeDeeRender/stories/ImageRender.stories.tsx @@ -2,10 +2,10 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { MessageEvent } from "@lichtblick/studio"; import { Topic } from "@lichtblick/studio-base/players/types"; import PanelSetup, { Fixture } from "@lichtblick/studio-base/stories/PanelSetup"; import { useReadySignal } from "@lichtblick/studio-base/stories/ReadySignalContext"; +import { MessageEvent } from "@lichtblick/suite"; import { StoryObj } from "@storybook/react"; import { userEvent, screen } from "@storybook/testing-library"; import { useEffect, useState } from "react"; diff --git a/packages/studio-base/src/panels/ThreeDeeRender/stories/LabelMarkers.stories.tsx b/packages/studio-base/src/panels/ThreeDeeRender/stories/LabelMarkers.stories.tsx index fa123df0382..d60951cdc72 100644 --- a/packages/studio-base/src/panels/ThreeDeeRender/stories/LabelMarkers.stories.tsx +++ b/packages/studio-base/src/panels/ThreeDeeRender/stories/LabelMarkers.stories.tsx @@ -2,9 +2,9 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { MessageEvent } from "@lichtblick/studio"; import { Topic } from "@lichtblick/studio-base/players/types"; import PanelSetup from "@lichtblick/studio-base/stories/PanelSetup"; +import { MessageEvent } from "@lichtblick/suite"; import { StoryObj } from "@storybook/react"; import { makeColor, QUAT_IDENTITY, rad2deg, SENSOR_FRAME_ID } from "./common"; diff --git a/packages/studio-base/src/panels/ThreeDeeRender/stories/LargeTransform.stories.tsx b/packages/studio-base/src/panels/ThreeDeeRender/stories/LargeTransform.stories.tsx index b53eb02b1e7..810bbcd233e 100644 --- a/packages/studio-base/src/panels/ThreeDeeRender/stories/LargeTransform.stories.tsx +++ b/packages/studio-base/src/panels/ThreeDeeRender/stories/LargeTransform.stories.tsx @@ -2,9 +2,9 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { MessageEvent } from "@lichtblick/studio"; import { Topic } from "@lichtblick/studio-base/players/types"; import PanelSetup from "@lichtblick/studio-base/stories/PanelSetup"; +import { MessageEvent } from "@lichtblick/suite"; import { StoryObj } from "@storybook/react"; import { fromSec } from "@foxglove/rostime"; diff --git a/packages/studio-base/src/panels/ThreeDeeRender/stories/MarkerLifetimes.stories.tsx b/packages/studio-base/src/panels/ThreeDeeRender/stories/MarkerLifetimes.stories.tsx index ca57a680c79..7430a06becf 100644 --- a/packages/studio-base/src/panels/ThreeDeeRender/stories/MarkerLifetimes.stories.tsx +++ b/packages/studio-base/src/panels/ThreeDeeRender/stories/MarkerLifetimes.stories.tsx @@ -2,9 +2,9 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { MessageEvent } from "@lichtblick/studio"; import { Topic } from "@lichtblick/studio-base/players/types"; import PanelSetup from "@lichtblick/studio-base/stories/PanelSetup"; +import { MessageEvent } from "@lichtblick/suite"; import { StoryObj } from "@storybook/react"; import { fromSec } from "@foxglove/rostime"; diff --git a/packages/studio-base/src/panels/ThreeDeeRender/stories/Marker_PointCloud2_Alignment.stories.tsx b/packages/studio-base/src/panels/ThreeDeeRender/stories/Marker_PointCloud2_Alignment.stories.tsx index e17cc62fe12..8efbc368dc2 100644 --- a/packages/studio-base/src/panels/ThreeDeeRender/stories/Marker_PointCloud2_Alignment.stories.tsx +++ b/packages/studio-base/src/panels/ThreeDeeRender/stories/Marker_PointCloud2_Alignment.stories.tsx @@ -2,9 +2,9 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { MessageEvent } from "@lichtblick/studio"; import { Topic } from "@lichtblick/studio-base/players/types"; import PanelSetup from "@lichtblick/studio-base/stories/PanelSetup"; +import { MessageEvent } from "@lichtblick/suite"; import { StoryObj } from "@storybook/react"; import { makeColor, QUAT_IDENTITY, rad2deg, packRvizRgba, VEC3_ZERO } from "./common"; diff --git a/packages/studio-base/src/panels/ThreeDeeRender/stories/Markers.stories.tsx b/packages/studio-base/src/panels/ThreeDeeRender/stories/Markers.stories.tsx index fee43f8fea7..b076adac325 100644 --- a/packages/studio-base/src/panels/ThreeDeeRender/stories/Markers.stories.tsx +++ b/packages/studio-base/src/panels/ThreeDeeRender/stories/Markers.stories.tsx @@ -2,10 +2,10 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { MessageEvent } from "@lichtblick/studio"; import { Topic } from "@lichtblick/studio-base/players/types"; import PanelSetup, { Fixture } from "@lichtblick/studio-base/stories/PanelSetup"; import { useReadySignal } from "@lichtblick/studio-base/stories/ReadySignalContext"; +import { MessageEvent } from "@lichtblick/suite"; import { StoryObj } from "@storybook/react"; import { userEvent, screen } from "@storybook/testing-library"; import { useEffect, useState } from "react"; diff --git a/packages/studio-base/src/panels/ThreeDeeRender/stories/MeasurementTool.stories.tsx b/packages/studio-base/src/panels/ThreeDeeRender/stories/MeasurementTool.stories.tsx index 9abe6acce1e..1957704ad04 100644 --- a/packages/studio-base/src/panels/ThreeDeeRender/stories/MeasurementTool.stories.tsx +++ b/packages/studio-base/src/panels/ThreeDeeRender/stories/MeasurementTool.stories.tsx @@ -2,10 +2,10 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { MessageEvent } from "@lichtblick/studio"; import { Topic } from "@lichtblick/studio-base/players/types"; import PanelSetup from "@lichtblick/studio-base/stories/PanelSetup"; import delay from "@lichtblick/studio-base/util/delay"; +import { MessageEvent } from "@lichtblick/suite"; import { StoryObj } from "@storybook/react"; import { QUAT_IDENTITY, rad2deg } from "./common"; diff --git a/packages/studio-base/src/panels/ThreeDeeRender/stories/MeshMarkerOrientation.stories.tsx b/packages/studio-base/src/panels/ThreeDeeRender/stories/MeshMarkerOrientation.stories.tsx index e314358833c..a81a5223f1b 100644 --- a/packages/studio-base/src/panels/ThreeDeeRender/stories/MeshMarkerOrientation.stories.tsx +++ b/packages/studio-base/src/panels/ThreeDeeRender/stories/MeshMarkerOrientation.stories.tsx @@ -2,9 +2,9 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { MessageEvent } from "@lichtblick/studio"; import { Topic } from "@lichtblick/studio-base/players/types"; import PanelSetup from "@lichtblick/studio-base/stories/PanelSetup"; +import { MessageEvent } from "@lichtblick/suite"; import { StoryObj } from "@storybook/react"; import { diff --git a/packages/studio-base/src/panels/ThreeDeeRender/stories/MeshMarkers.stories.tsx b/packages/studio-base/src/panels/ThreeDeeRender/stories/MeshMarkers.stories.tsx index 3d8894b5569..322cbbba98f 100644 --- a/packages/studio-base/src/panels/ThreeDeeRender/stories/MeshMarkers.stories.tsx +++ b/packages/studio-base/src/panels/ThreeDeeRender/stories/MeshMarkers.stories.tsx @@ -2,9 +2,9 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { MessageEvent } from "@lichtblick/studio"; import { Topic } from "@lichtblick/studio-base/players/types"; import PanelSetup from "@lichtblick/studio-base/stories/PanelSetup"; +import { MessageEvent } from "@lichtblick/suite"; import { StoryObj } from "@storybook/react"; import { makeColor, OBJ_CUBE_MESH_RESOURCE, QUAT_IDENTITY, STL_CUBE_MESH_RESOURCE } from "./common"; diff --git a/packages/studio-base/src/panels/ThreeDeeRender/stories/NavMsgs_Path.stories.tsx b/packages/studio-base/src/panels/ThreeDeeRender/stories/NavMsgs_Path.stories.tsx index 5ff94f95c1f..270807197f2 100644 --- a/packages/studio-base/src/panels/ThreeDeeRender/stories/NavMsgs_Path.stories.tsx +++ b/packages/studio-base/src/panels/ThreeDeeRender/stories/NavMsgs_Path.stories.tsx @@ -2,9 +2,9 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { MessageEvent } from "@lichtblick/studio"; import { Topic } from "@lichtblick/studio-base/players/types"; import PanelSetup from "@lichtblick/studio-base/stories/PanelSetup"; +import { MessageEvent } from "@lichtblick/suite"; import { StoryObj } from "@storybook/react"; import { quat } from "gl-matrix"; diff --git a/packages/studio-base/src/panels/ThreeDeeRender/stories/OccupancyGrid.stories.tsx b/packages/studio-base/src/panels/ThreeDeeRender/stories/OccupancyGrid.stories.tsx index cec4ff1f3df..89257b54695 100644 --- a/packages/studio-base/src/panels/ThreeDeeRender/stories/OccupancyGrid.stories.tsx +++ b/packages/studio-base/src/panels/ThreeDeeRender/stories/OccupancyGrid.stories.tsx @@ -2,10 +2,10 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { MessageEvent } from "@lichtblick/studio"; import { LayerSettingsOccupancyGrid } from "@lichtblick/studio-base/panels/ThreeDeeRender/renderables/OccupancyGrids"; import { Topic } from "@lichtblick/studio-base/players/types"; import PanelSetup from "@lichtblick/studio-base/stories/PanelSetup"; +import { MessageEvent } from "@lichtblick/suite"; import { StoryObj } from "@storybook/react"; import { screen, userEvent, waitFor } from "@storybook/testing-library"; diff --git a/packages/studio-base/src/panels/ThreeDeeRender/stories/PoseMarkers.stories.tsx b/packages/studio-base/src/panels/ThreeDeeRender/stories/PoseMarkers.stories.tsx index 0f60e2bc453..eab3a05ab29 100644 --- a/packages/studio-base/src/panels/ThreeDeeRender/stories/PoseMarkers.stories.tsx +++ b/packages/studio-base/src/panels/ThreeDeeRender/stories/PoseMarkers.stories.tsx @@ -2,9 +2,9 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { MessageEvent } from "@lichtblick/studio"; import { Topic } from "@lichtblick/studio-base/players/types"; import PanelSetup from "@lichtblick/studio-base/stories/PanelSetup"; +import { MessageEvent } from "@lichtblick/suite"; import { StoryObj } from "@storybook/react"; import { diff --git a/packages/studio-base/src/panels/ThreeDeeRender/stories/PublishClickTool.stories.tsx b/packages/studio-base/src/panels/ThreeDeeRender/stories/PublishClickTool.stories.tsx index 53b3c514e53..b226d8ebd6c 100644 --- a/packages/studio-base/src/panels/ThreeDeeRender/stories/PublishClickTool.stories.tsx +++ b/packages/studio-base/src/panels/ThreeDeeRender/stories/PublishClickTool.stories.tsx @@ -2,10 +2,10 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { MessageEvent } from "@lichtblick/studio"; import { PlayerCapabilities, Topic } from "@lichtblick/studio-base/players/types"; import PanelSetup from "@lichtblick/studio-base/stories/PanelSetup"; import delay from "@lichtblick/studio-base/util/delay"; +import { MessageEvent } from "@lichtblick/suite"; import { StoryObj } from "@storybook/react"; import { userEvent, screen } from "@storybook/testing-library"; diff --git a/packages/studio-base/src/panels/ThreeDeeRender/stories/SceneEntities.stories.tsx b/packages/studio-base/src/panels/ThreeDeeRender/stories/SceneEntities.stories.tsx index 3c3c9094251..f02e0a710e2 100644 --- a/packages/studio-base/src/panels/ThreeDeeRender/stories/SceneEntities.stories.tsx +++ b/packages/studio-base/src/panels/ThreeDeeRender/stories/SceneEntities.stories.tsx @@ -2,12 +2,12 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { MessageEvent } from "@lichtblick/studio"; import { ColorRGBA } from "@lichtblick/studio-base/panels/ThreeDeeRender/ros"; import { xyzrpyToPose } from "@lichtblick/studio-base/panels/ThreeDeeRender/transforms"; import { Topic } from "@lichtblick/studio-base/players/types"; import PanelSetup, { Fixture } from "@lichtblick/studio-base/stories/PanelSetup"; import { useReadySignal } from "@lichtblick/studio-base/stories/ReadySignalContext"; +import { MessageEvent } from "@lichtblick/suite"; import { StoryObj } from "@storybook/react"; import { useEffect, useMemo, useState } from "react"; import * as THREE from "three"; diff --git a/packages/studio-base/src/panels/ThreeDeeRender/stories/SensorMsgs_LaserScan.stories.tsx b/packages/studio-base/src/panels/ThreeDeeRender/stories/SensorMsgs_LaserScan.stories.tsx index 18e58c703e0..f30a0b6235d 100644 --- a/packages/studio-base/src/panels/ThreeDeeRender/stories/SensorMsgs_LaserScan.stories.tsx +++ b/packages/studio-base/src/panels/ThreeDeeRender/stories/SensorMsgs_LaserScan.stories.tsx @@ -2,9 +2,9 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { MessageEvent } from "@lichtblick/studio"; import { Topic } from "@lichtblick/studio-base/players/types"; import PanelSetup from "@lichtblick/studio-base/stories/PanelSetup"; +import { MessageEvent } from "@lichtblick/suite"; import { StoryObj } from "@storybook/react"; import * as THREE from "three"; diff --git a/packages/studio-base/src/panels/ThreeDeeRender/stories/SensorMsgs_PointCloud2.stories.tsx b/packages/studio-base/src/panels/ThreeDeeRender/stories/SensorMsgs_PointCloud2.stories.tsx index 7a0310b8dc2..ff42b2d7849 100644 --- a/packages/studio-base/src/panels/ThreeDeeRender/stories/SensorMsgs_PointCloud2.stories.tsx +++ b/packages/studio-base/src/panels/ThreeDeeRender/stories/SensorMsgs_PointCloud2.stories.tsx @@ -2,9 +2,9 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { MessageEvent } from "@lichtblick/studio"; import { Topic } from "@lichtblick/studio-base/players/types"; import PanelSetup from "@lichtblick/studio-base/stories/PanelSetup"; +import { MessageEvent } from "@lichtblick/suite"; import { StoryObj } from "@storybook/react"; import { vec3 } from "gl-matrix"; diff --git a/packages/studio-base/src/panels/ThreeDeeRender/stories/SphereListPointsTransform.stories.tsx b/packages/studio-base/src/panels/ThreeDeeRender/stories/SphereListPointsTransform.stories.tsx index 4bb03ba4dd5..f235add1017 100644 --- a/packages/studio-base/src/panels/ThreeDeeRender/stories/SphereListPointsTransform.stories.tsx +++ b/packages/studio-base/src/panels/ThreeDeeRender/stories/SphereListPointsTransform.stories.tsx @@ -2,10 +2,10 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { MessageEvent } from "@lichtblick/studio"; import { Topic } from "@lichtblick/studio-base/players/types"; import PanelSetup from "@lichtblick/studio-base/stories/PanelSetup"; import { SphereListMarker } from "@lichtblick/studio-base/types/Messages"; +import { MessageEvent } from "@lichtblick/suite"; import { StoryObj } from "@storybook/react"; import { DeepWritable } from "ts-essentials"; diff --git a/packages/studio-base/src/panels/ThreeDeeRender/stories/TransformInterpolation.stories.tsx b/packages/studio-base/src/panels/ThreeDeeRender/stories/TransformInterpolation.stories.tsx index 80328cf49b3..f182e51fa6b 100644 --- a/packages/studio-base/src/panels/ThreeDeeRender/stories/TransformInterpolation.stories.tsx +++ b/packages/studio-base/src/panels/ThreeDeeRender/stories/TransformInterpolation.stories.tsx @@ -2,9 +2,9 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { MessageEvent } from "@lichtblick/studio"; import { Topic } from "@lichtblick/studio-base/players/types"; import PanelSetup from "@lichtblick/studio-base/stories/PanelSetup"; +import { MessageEvent } from "@lichtblick/suite"; import { StoryObj } from "@storybook/react"; import { fromSec } from "@foxglove/rostime"; diff --git a/packages/studio-base/src/panels/ThreeDeeRender/stories/Urdfs.stories.tsx b/packages/studio-base/src/panels/ThreeDeeRender/stories/Urdfs.stories.tsx index ac857637cd2..0ee1e2e0549 100644 --- a/packages/studio-base/src/panels/ThreeDeeRender/stories/Urdfs.stories.tsx +++ b/packages/studio-base/src/panels/ThreeDeeRender/stories/Urdfs.stories.tsx @@ -2,9 +2,9 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { MessageEvent } from "@lichtblick/studio"; import { Topic } from "@lichtblick/studio-base/players/types"; import PanelSetup from "@lichtblick/studio-base/stories/PanelSetup"; +import { MessageEvent } from "@lichtblick/suite"; import { StoryObj } from "@storybook/react"; import { makeColor, STL_CUBE_MESH_RESOURCE } from "./common"; diff --git a/packages/studio-base/src/panels/ThreeDeeRender/stories/common.ts b/packages/studio-base/src/panels/ThreeDeeRender/stories/common.ts index 8fbf9d0773b..0cec30a036c 100644 --- a/packages/studio-base/src/panels/ThreeDeeRender/stories/common.ts +++ b/packages/studio-base/src/panels/ThreeDeeRender/stories/common.ts @@ -2,7 +2,7 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import type { MessageEvent } from "@lichtblick/studio"; +import type { MessageEvent } from "@lichtblick/suite"; import * as base64 from "@protobufjs/base64"; import type { Time } from "@foxglove/rostime"; diff --git a/packages/studio-base/src/panels/ThreeDeeRender/stories/foxglove.FrameTransform.stories.tsx b/packages/studio-base/src/panels/ThreeDeeRender/stories/foxglove.FrameTransform.stories.tsx index eb7dc984d5b..bea05eb8387 100644 --- a/packages/studio-base/src/panels/ThreeDeeRender/stories/foxglove.FrameTransform.stories.tsx +++ b/packages/studio-base/src/panels/ThreeDeeRender/stories/foxglove.FrameTransform.stories.tsx @@ -2,9 +2,9 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { MessageEvent } from "@lichtblick/studio"; import { Topic } from "@lichtblick/studio-base/players/types"; import PanelSetup from "@lichtblick/studio-base/stories/PanelSetup"; +import { MessageEvent } from "@lichtblick/suite"; import { StoryObj } from "@storybook/react"; import { fromSec } from "@foxglove/rostime"; diff --git a/packages/studio-base/src/panels/ThreeDeeRender/stories/foxglove.FrameTransforms.stories.tsx b/packages/studio-base/src/panels/ThreeDeeRender/stories/foxglove.FrameTransforms.stories.tsx index 7ec094e19e8..f5a79260b48 100644 --- a/packages/studio-base/src/panels/ThreeDeeRender/stories/foxglove.FrameTransforms.stories.tsx +++ b/packages/studio-base/src/panels/ThreeDeeRender/stories/foxglove.FrameTransforms.stories.tsx @@ -2,9 +2,9 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { MessageEvent } from "@lichtblick/studio"; import { Topic } from "@lichtblick/studio-base/players/types"; import PanelSetup from "@lichtblick/studio-base/stories/PanelSetup"; +import { MessageEvent } from "@lichtblick/suite"; import { StoryObj } from "@storybook/react"; import { screen, userEvent } from "@storybook/testing-library"; diff --git a/packages/studio-base/src/panels/ThreeDeeRender/stories/foxglove.Grid.stories.tsx b/packages/studio-base/src/panels/ThreeDeeRender/stories/foxglove.Grid.stories.tsx index 82d020109de..6851c827a93 100644 --- a/packages/studio-base/src/panels/ThreeDeeRender/stories/foxglove.Grid.stories.tsx +++ b/packages/studio-base/src/panels/ThreeDeeRender/stories/foxglove.Grid.stories.tsx @@ -2,10 +2,10 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { MessageEvent } from "@lichtblick/studio"; import { LayerSettingsFoxgloveGrid } from "@lichtblick/studio-base/panels/ThreeDeeRender/renderables/FoxgloveGrid"; import { Topic } from "@lichtblick/studio-base/players/types"; import PanelSetup from "@lichtblick/studio-base/stories/PanelSetup"; +import { MessageEvent } from "@lichtblick/suite"; import { StoryObj } from "@storybook/react"; import { Grid, NumericType } from "@foxglove/schemas"; diff --git a/packages/studio-base/src/panels/ThreeDeeRender/stories/foxglove.LaserScan.stories.tsx b/packages/studio-base/src/panels/ThreeDeeRender/stories/foxglove.LaserScan.stories.tsx index d839d99f619..7e80118cdad 100644 --- a/packages/studio-base/src/panels/ThreeDeeRender/stories/foxglove.LaserScan.stories.tsx +++ b/packages/studio-base/src/panels/ThreeDeeRender/stories/foxglove.LaserScan.stories.tsx @@ -2,11 +2,11 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { MessageEvent } from "@lichtblick/studio"; import { xyzrpyToPose } from "@lichtblick/studio-base/panels/ThreeDeeRender/transforms"; import { Topic } from "@lichtblick/studio-base/players/types"; import PanelSetup from "@lichtblick/studio-base/stories/PanelSetup"; import { emptyPose } from "@lichtblick/studio-base/util/Pose"; +import { MessageEvent } from "@lichtblick/suite"; import { StoryObj } from "@storybook/react"; import { screen, userEvent } from "@storybook/testing-library"; import * as THREE from "three"; diff --git a/packages/studio-base/src/panels/ThreeDeeRender/stories/foxglove.PointCloud.stories.tsx b/packages/studio-base/src/panels/ThreeDeeRender/stories/foxglove.PointCloud.stories.tsx index c324cbecf80..ffab169311a 100644 --- a/packages/studio-base/src/panels/ThreeDeeRender/stories/foxglove.PointCloud.stories.tsx +++ b/packages/studio-base/src/panels/ThreeDeeRender/stories/foxglove.PointCloud.stories.tsx @@ -2,9 +2,9 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { MessageEvent } from "@lichtblick/studio"; import { Topic } from "@lichtblick/studio-base/players/types"; import PanelSetup from "@lichtblick/studio-base/stories/PanelSetup"; +import { MessageEvent } from "@lichtblick/suite"; import { StoryObj } from "@storybook/react"; import { screen, userEvent } from "@storybook/testing-library"; import { vec3 } from "gl-matrix"; diff --git a/packages/studio-base/src/panels/ThreeDeeRender/stories/foxglove.PoseInFrame.stories.tsx b/packages/studio-base/src/panels/ThreeDeeRender/stories/foxglove.PoseInFrame.stories.tsx index 9247d16b105..e12d6542bd5 100644 --- a/packages/studio-base/src/panels/ThreeDeeRender/stories/foxglove.PoseInFrame.stories.tsx +++ b/packages/studio-base/src/panels/ThreeDeeRender/stories/foxglove.PoseInFrame.stories.tsx @@ -2,9 +2,9 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { MessageEvent } from "@lichtblick/studio"; import { Topic } from "@lichtblick/studio-base/players/types"; import PanelSetup from "@lichtblick/studio-base/stories/PanelSetup"; +import { MessageEvent } from "@lichtblick/suite"; import { StoryObj } from "@storybook/react"; import { userEvent, screen } from "@storybook/testing-library"; import { quat } from "gl-matrix"; diff --git a/packages/studio-base/src/panels/ThreeDeeRender/stories/foxglove.PosesInFrame.stories.tsx b/packages/studio-base/src/panels/ThreeDeeRender/stories/foxglove.PosesInFrame.stories.tsx index 5c235ccefaf..c0626b9703b 100644 --- a/packages/studio-base/src/panels/ThreeDeeRender/stories/foxglove.PosesInFrame.stories.tsx +++ b/packages/studio-base/src/panels/ThreeDeeRender/stories/foxglove.PosesInFrame.stories.tsx @@ -2,9 +2,9 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { MessageEvent } from "@lichtblick/studio"; import { Topic } from "@lichtblick/studio-base/players/types"; import PanelSetup from "@lichtblick/studio-base/stories/PanelSetup"; +import { MessageEvent } from "@lichtblick/suite"; import { StoryObj } from "@storybook/react"; import { userEvent, screen } from "@storybook/testing-library"; import { quat } from "gl-matrix"; diff --git a/packages/studio-base/src/panels/ThreeDeeRender/topicIsConvertibleToSchema.ts b/packages/studio-base/src/panels/ThreeDeeRender/topicIsConvertibleToSchema.ts index da7e14bef4f..6d003f55d3a 100644 --- a/packages/studio-base/src/panels/ThreeDeeRender/topicIsConvertibleToSchema.ts +++ b/packages/studio-base/src/panels/ThreeDeeRender/topicIsConvertibleToSchema.ts @@ -2,7 +2,7 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { Topic } from "@lichtblick/studio"; +import { Topic } from "@lichtblick/suite"; /** * Determines whether `topic` has a supported schema from the set of `supportedSchemaNames`, either diff --git a/packages/studio-base/src/panels/UserScriptEditor/index.tsx b/packages/studio-base/src/panels/UserScriptEditor/index.tsx index 2b1bd6f3ff2..b59850331c7 100644 --- a/packages/studio-base/src/panels/UserScriptEditor/index.tsx +++ b/packages/studio-base/src/panels/UserScriptEditor/index.tsx @@ -11,7 +11,6 @@ // found at http://www.apache.org/licenses/LICENSE-2.0 // You may not use this file except in compliance with the License. -import { SettingsTreeAction, SettingsTreeNodes } from "@lichtblick/studio"; import EmptyState from "@lichtblick/studio-base/components/EmptyState"; import Panel from "@lichtblick/studio-base/components/Panel"; import PanelToolbar from "@lichtblick/studio-base/components/PanelToolbar"; @@ -29,6 +28,7 @@ import BottomBar from "@lichtblick/studio-base/panels/UserScriptEditor/BottomBar import { Sidebar } from "@lichtblick/studio-base/panels/UserScriptEditor/Sidebar"; import { usePanelSettingsTreeUpdate } from "@lichtblick/studio-base/providers/PanelStateContextProvider"; import { SaveConfig, UserScripts } from "@lichtblick/studio-base/types/panels"; +import { SettingsTreeAction, SettingsTreeNodes } from "@lichtblick/suite"; import AddIcon from "@mui/icons-material/Add"; import ArrowBackIcon from "@mui/icons-material/ArrowBack"; import { diff --git a/packages/studio-base/src/panels/VariableSlider/settings.ts b/packages/studio-base/src/panels/VariableSlider/settings.ts index 9e163305936..0cf0c0dd7df 100644 --- a/packages/studio-base/src/panels/VariableSlider/settings.ts +++ b/packages/studio-base/src/panels/VariableSlider/settings.ts @@ -2,9 +2,9 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { SettingsTreeAction, SettingsTreeNodes } from "@lichtblick/studio"; import { usePanelSettingsTreeUpdate } from "@lichtblick/studio-base/providers/PanelStateContextProvider"; import { SaveConfig } from "@lichtblick/studio-base/types/panels"; +import { SettingsTreeAction, SettingsTreeNodes } from "@lichtblick/suite"; import { produce } from "immer"; import * as _ from "lodash-es"; import { useCallback, useEffect } from "react"; diff --git a/packages/studio-base/src/panels/diagnostics/DiagnosticStatusPanel.tsx b/packages/studio-base/src/panels/diagnostics/DiagnosticStatusPanel.tsx index 6e2ccdb1efc..c518ce23685 100644 --- a/packages/studio-base/src/panels/diagnostics/DiagnosticStatusPanel.tsx +++ b/packages/studio-base/src/panels/diagnostics/DiagnosticStatusPanel.tsx @@ -11,7 +11,6 @@ // found at http://www.apache.org/licenses/LICENSE-2.0 // You may not use this file except in compliance with the License. -import { SettingsTreeAction } from "@lichtblick/studio"; import { useDataSourceInfo } from "@lichtblick/studio-base/PanelAPI"; import EmptyState from "@lichtblick/studio-base/components/EmptyState"; import Panel from "@lichtblick/studio-base/components/Panel"; @@ -21,6 +20,7 @@ import Stack from "@lichtblick/studio-base/components/Stack"; import useStaleTime from "@lichtblick/studio-base/panels/diagnostics/useStaleTime"; import { usePanelSettingsTreeUpdate } from "@lichtblick/studio-base/providers/PanelStateContextProvider"; import { SaveConfig } from "@lichtblick/studio-base/types/panels"; +import { SettingsTreeAction } from "@lichtblick/suite"; import { Autocomplete, TextField } from "@mui/material"; import { produce } from "immer"; import * as _ from "lodash-es"; diff --git a/packages/studio-base/src/panels/diagnostics/DiagnosticSummary.tsx b/packages/studio-base/src/panels/diagnostics/DiagnosticSummary.tsx index df4fdb6ddc6..ebc24cd0344 100644 --- a/packages/studio-base/src/panels/diagnostics/DiagnosticSummary.tsx +++ b/packages/studio-base/src/panels/diagnostics/DiagnosticSummary.tsx @@ -12,7 +12,6 @@ // You may not use this file except in compliance with the License. import { filterMap } from "@lichtblick/den/collection"; -import { SettingsTreeAction } from "@lichtblick/studio"; import { useDataSourceInfo } from "@lichtblick/studio-base/PanelAPI"; import EmptyState from "@lichtblick/studio-base/components/EmptyState"; import Panel from "@lichtblick/studio-base/components/Panel"; @@ -24,6 +23,7 @@ import useStaleTime from "@lichtblick/studio-base/panels/diagnostics/useStaleTim import { usePanelSettingsTreeUpdate } from "@lichtblick/studio-base/providers/PanelStateContextProvider"; import { SaveConfig } from "@lichtblick/studio-base/types/panels"; import toggle from "@lichtblick/studio-base/util/toggle"; +import { SettingsTreeAction } from "@lichtblick/suite"; import PushPinIcon from "@mui/icons-material/PushPin"; import { IconButton, diff --git a/packages/studio-base/src/panels/diagnostics/settings.ts b/packages/studio-base/src/panels/diagnostics/settings.ts index 3651ea47610..5083b14c020 100644 --- a/packages/studio-base/src/panels/diagnostics/settings.ts +++ b/packages/studio-base/src/panels/diagnostics/settings.ts @@ -2,7 +2,7 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { SettingsTreeNodes } from "@lichtblick/studio"; +import { SettingsTreeNodes } from "@lichtblick/suite"; import { DEFAULT_SECONDS_UNTIL_STALE, diff --git a/packages/studio-base/src/players/FoxgloveWebSocketPlayer/index.ts b/packages/studio-base/src/players/FoxgloveWebSocketPlayer/index.ts index 04d57de84df..c6db2c7ea88 100644 --- a/packages/studio-base/src/players/FoxgloveWebSocketPlayer/index.ts +++ b/packages/studio-base/src/players/FoxgloveWebSocketPlayer/index.ts @@ -4,7 +4,6 @@ import { debouncePromise } from "@lichtblick/den/async"; import Log from "@lichtblick/log"; -import { ParameterValue } from "@lichtblick/studio"; import { Asset } from "@lichtblick/studio-base/components/PanelExtensionAdapter"; import PlayerProblemManager from "@lichtblick/studio-base/players/PlayerProblemManager"; import { estimateObjectSize } from "@lichtblick/studio-base/players/messageMemoryEstimation"; @@ -23,6 +22,7 @@ import { TopicStats, } from "@lichtblick/studio-base/players/types"; import rosDatatypesToMessageDefinition from "@lichtblick/studio-base/util/rosDatatypesToMessageDefinition"; +import { ParameterValue } from "@lichtblick/suite"; import * as base64 from "@protobufjs/base64"; import * as _ from "lodash-es"; import { v4 as uuidv4 } from "uuid"; diff --git a/packages/studio-base/src/players/IterablePlayer/BlockLoader.test.ts b/packages/studio-base/src/players/IterablePlayer/BlockLoader.test.ts index 37977230097..84679c39f57 100644 --- a/packages/studio-base/src/players/IterablePlayer/BlockLoader.test.ts +++ b/packages/studio-base/src/players/IterablePlayer/BlockLoader.test.ts @@ -2,10 +2,10 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { Immutable, MessageEvent } from "@lichtblick/studio"; import PlayerProblemManager from "@lichtblick/studio-base/players/PlayerProblemManager"; import { MessageBlock } from "@lichtblick/studio-base/players/types"; import { mockTopicSelection } from "@lichtblick/studio-base/test/mocks/mockTopicSelection"; +import { Immutable, MessageEvent } from "@lichtblick/suite"; import { BlockLoader, MEMORY_INFO_PRELOADED_MSGS } from "./BlockLoader"; import { diff --git a/packages/studio-base/src/players/IterablePlayer/BlockLoader.ts b/packages/studio-base/src/players/IterablePlayer/BlockLoader.ts index b862c606c21..a37acb457f0 100644 --- a/packages/studio-base/src/players/IterablePlayer/BlockLoader.ts +++ b/packages/studio-base/src/players/IterablePlayer/BlockLoader.ts @@ -5,10 +5,10 @@ import { Condvar } from "@lichtblick/den/async"; import { filterMap } from "@lichtblick/den/collection"; import Log from "@lichtblick/log"; -import { Immutable, MessageEvent } from "@lichtblick/studio"; import { IteratorCursor } from "@lichtblick/studio-base/players/IterablePlayer/IteratorCursor"; import PlayerProblemManager from "@lichtblick/studio-base/players/PlayerProblemManager"; import { MessageBlock, Progress, TopicSelection } from "@lichtblick/studio-base/players/types"; +import { Immutable, MessageEvent } from "@lichtblick/suite"; import { simplify } from "intervals-fn"; import * as _ from "lodash-es"; diff --git a/packages/studio-base/src/players/IterablePlayer/BufferedIterableSource.test.ts b/packages/studio-base/src/players/IterablePlayer/BufferedIterableSource.test.ts index 618ec3ff977..a4bd4b6f82f 100644 --- a/packages/studio-base/src/players/IterablePlayer/BufferedIterableSource.test.ts +++ b/packages/studio-base/src/players/IterablePlayer/BufferedIterableSource.test.ts @@ -2,8 +2,8 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { MessageEvent } from "@lichtblick/studio"; import { mockTopicSelection } from "@lichtblick/studio-base/test/mocks/mockTopicSelection"; +import { MessageEvent } from "@lichtblick/suite"; import * as _ from "lodash-es"; import { BufferedIterableSource } from "./BufferedIterableSource"; diff --git a/packages/studio-base/src/players/IterablePlayer/BufferedIterableSource.ts b/packages/studio-base/src/players/IterablePlayer/BufferedIterableSource.ts index ccd7249e1ec..20556154f05 100644 --- a/packages/studio-base/src/players/IterablePlayer/BufferedIterableSource.ts +++ b/packages/studio-base/src/players/IterablePlayer/BufferedIterableSource.ts @@ -5,8 +5,8 @@ import { Condvar } from "@lichtblick/den/async"; import { VecQueue } from "@lichtblick/den/collection"; import Log from "@lichtblick/log"; -import { Time, MessageEvent } from "@lichtblick/studio"; import { Range } from "@lichtblick/studio-base/util/ranges"; +import { Time, MessageEvent } from "@lichtblick/suite"; import EventEmitter from "eventemitter3"; import { add as addTime, compare, clampTime } from "@foxglove/rostime"; diff --git a/packages/studio-base/src/players/IterablePlayer/CachingIterableSource.test.ts b/packages/studio-base/src/players/IterablePlayer/CachingIterableSource.test.ts index 8bc956059ff..d829e847e17 100644 --- a/packages/studio-base/src/players/IterablePlayer/CachingIterableSource.test.ts +++ b/packages/studio-base/src/players/IterablePlayer/CachingIterableSource.test.ts @@ -2,8 +2,8 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { MessageEvent } from "@lichtblick/studio"; import { mockTopicSelection } from "@lichtblick/studio-base/test/mocks/mockTopicSelection"; +import { MessageEvent } from "@lichtblick/suite"; import { CachingIterableSource } from "./CachingIterableSource"; import { diff --git a/packages/studio-base/src/players/IterablePlayer/CachingIterableSource.ts b/packages/studio-base/src/players/IterablePlayer/CachingIterableSource.ts index f3e3e659d18..d812aea21c0 100644 --- a/packages/studio-base/src/players/IterablePlayer/CachingIterableSource.ts +++ b/packages/studio-base/src/players/IterablePlayer/CachingIterableSource.ts @@ -4,9 +4,9 @@ import { minIndexBy, sortedIndexByTuple } from "@lichtblick/den/collection"; import Log from "@lichtblick/log"; -import { MessageEvent, Time } from "@lichtblick/studio"; import { TopicSelection } from "@lichtblick/studio-base/players/types"; import { Range } from "@lichtblick/studio-base/util/ranges"; +import { MessageEvent, Time } from "@lichtblick/suite"; import EventEmitter from "eventemitter3"; import * as _ from "lodash-es"; diff --git a/packages/studio-base/src/players/IterablePlayer/IIterableSource.ts b/packages/studio-base/src/players/IterablePlayer/IIterableSource.ts index 5a0606106b4..2bda4aa48ef 100644 --- a/packages/studio-base/src/players/IterablePlayer/IIterableSource.ts +++ b/packages/studio-base/src/players/IterablePlayer/IIterableSource.ts @@ -2,7 +2,6 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { Immutable, MessageEvent, Metadata } from "@lichtblick/studio"; import { PlayerProblem, Topic, @@ -10,6 +9,7 @@ import { TopicStats, } from "@lichtblick/studio-base/players/types"; import { RosDatatypes } from "@lichtblick/studio-base/types/RosDatatypes"; +import { Immutable, MessageEvent, Metadata } from "@lichtblick/suite"; import { Time } from "@foxglove/rostime"; diff --git a/packages/studio-base/src/players/IterablePlayer/IterablePlayer.ts b/packages/studio-base/src/players/IterablePlayer/IterablePlayer.ts index 3db4eea521a..ceb03183abd 100644 --- a/packages/studio-base/src/players/IterablePlayer/IterablePlayer.ts +++ b/packages/studio-base/src/players/IterablePlayer/IterablePlayer.ts @@ -5,7 +5,6 @@ import { debouncePromise } from "@lichtblick/den/async"; import { filterMap } from "@lichtblick/den/collection"; import Log from "@lichtblick/log"; -import { Immutable, MessageEvent, Metadata, ParameterValue } from "@lichtblick/studio"; import { freezeMetadata } from "@lichtblick/studio-base/players/IterablePlayer/freezeMetadata"; import NoopMetricsCollector from "@lichtblick/studio-base/players/NoopMetricsCollector"; import PlayerProblemManager from "@lichtblick/studio-base/players/PlayerProblemManager"; @@ -26,6 +25,7 @@ import { } from "@lichtblick/studio-base/players/types"; import { RosDatatypes } from "@lichtblick/studio-base/types/RosDatatypes"; import delay from "@lichtblick/studio-base/util/delay"; +import { Immutable, MessageEvent, Metadata, ParameterValue } from "@lichtblick/suite"; import assert from "assert"; import * as _ from "lodash-es"; import { v4 as uuidv4 } from "uuid"; diff --git a/packages/studio-base/src/players/IterablePlayer/IteratorCursor.ts b/packages/studio-base/src/players/IterablePlayer/IteratorCursor.ts index 586f1503192..97a970f4832 100644 --- a/packages/studio-base/src/players/IterablePlayer/IteratorCursor.ts +++ b/packages/studio-base/src/players/IterablePlayer/IteratorCursor.ts @@ -2,7 +2,7 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { Time } from "@lichtblick/studio"; +import { Time } from "@lichtblick/suite"; import { compare, add as addTime } from "@foxglove/rostime"; diff --git a/packages/studio-base/src/players/IterablePlayer/Mcap/McapIndexedIterableSource.ts b/packages/studio-base/src/players/IterablePlayer/Mcap/McapIndexedIterableSource.ts index b1f63d675ba..17787a49aff 100644 --- a/packages/studio-base/src/players/IterablePlayer/Mcap/McapIndexedIterableSource.ts +++ b/packages/studio-base/src/players/IterablePlayer/Mcap/McapIndexedIterableSource.ts @@ -4,7 +4,6 @@ import { pickFields } from "@lichtblick/den/records"; import Logger from "@lichtblick/log"; -import { MessageEvent, Metadata } from "@lichtblick/studio"; import { GetBackfillMessagesArgs, IIterableSource, @@ -20,6 +19,7 @@ import { TopicStats, } from "@lichtblick/studio-base/players/types"; import { RosDatatypes } from "@lichtblick/studio-base/types/RosDatatypes"; +import { MessageEvent, Metadata } from "@lichtblick/suite"; import { McapIndexedReader, McapTypes } from "@mcap/core"; import { ParsedChannel, parseChannel } from "@foxglove/mcap-support"; diff --git a/packages/studio-base/src/players/IterablePlayer/Mcap/McapUnindexedIterableSource.ts b/packages/studio-base/src/players/IterablePlayer/Mcap/McapUnindexedIterableSource.ts index f60f90a0282..991699a73e5 100644 --- a/packages/studio-base/src/players/IterablePlayer/Mcap/McapUnindexedIterableSource.ts +++ b/packages/studio-base/src/players/IterablePlayer/Mcap/McapUnindexedIterableSource.ts @@ -2,7 +2,6 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { MessageEvent, Metadata } from "@lichtblick/studio"; import { GetBackfillMessagesArgs, IIterableSource, @@ -13,6 +12,7 @@ import { import { estimateObjectSize } from "@lichtblick/studio-base/players/messageMemoryEstimation"; import { PlayerProblem, Topic, TopicStats } from "@lichtblick/studio-base/players/types"; import { RosDatatypes } from "@lichtblick/studio-base/types/RosDatatypes"; +import { MessageEvent, Metadata } from "@lichtblick/suite"; import { McapStreamReader, McapTypes } from "@mcap/core"; import * as _ from "lodash-es"; diff --git a/packages/studio-base/src/players/IterablePlayer/WorkerIterableSource.ts b/packages/studio-base/src/players/IterablePlayer/WorkerIterableSource.ts index d529791fc4d..26118d259f3 100644 --- a/packages/studio-base/src/players/IterablePlayer/WorkerIterableSource.ts +++ b/packages/studio-base/src/players/IterablePlayer/WorkerIterableSource.ts @@ -3,7 +3,7 @@ // file, You can obtain one at http://mozilla.org/MPL/2.0/ import { ComlinkWrap } from "@lichtblick/den/worker"; -import { Immutable, MessageEvent, Time } from "@lichtblick/studio"; +import { Immutable, MessageEvent, Time } from "@lichtblick/suite"; import * as Comlink from "comlink"; import { abortSignalTransferHandler } from "@foxglove/comlink-transfer-handlers"; diff --git a/packages/studio-base/src/players/IterablePlayer/WorkerIterableSourceWorker.ts b/packages/studio-base/src/players/IterablePlayer/WorkerIterableSourceWorker.ts index 7e41d145210..eff1b7324ac 100644 --- a/packages/studio-base/src/players/IterablePlayer/WorkerIterableSourceWorker.ts +++ b/packages/studio-base/src/players/IterablePlayer/WorkerIterableSourceWorker.ts @@ -2,7 +2,7 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { Immutable, MessageEvent } from "@lichtblick/studio"; +import { Immutable, MessageEvent } from "@lichtblick/suite"; import * as Comlink from "comlink"; import { abortSignalTransferHandler } from "@foxglove/comlink-transfer-handlers"; diff --git a/packages/studio-base/src/players/IterablePlayer/freezeMetadata.test.ts b/packages/studio-base/src/players/IterablePlayer/freezeMetadata.test.ts index 3e4aaa811cc..0c0350f9eeb 100644 --- a/packages/studio-base/src/players/IterablePlayer/freezeMetadata.test.ts +++ b/packages/studio-base/src/players/IterablePlayer/freezeMetadata.test.ts @@ -2,8 +2,8 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { Metadata } from "@lichtblick/studio"; import { freezeMetadata } from "@lichtblick/studio-base/players/IterablePlayer/freezeMetadata"; +import { Metadata } from "@lichtblick/suite"; describe("freezeMetadata", () => { const metadata: Metadata[] = [ diff --git a/packages/studio-base/src/players/IterablePlayer/freezeMetadata.ts b/packages/studio-base/src/players/IterablePlayer/freezeMetadata.ts index 8907aab3161..457bd7d3843 100644 --- a/packages/studio-base/src/players/IterablePlayer/freezeMetadata.ts +++ b/packages/studio-base/src/players/IterablePlayer/freezeMetadata.ts @@ -2,7 +2,7 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { Metadata } from "@lichtblick/studio"; +import { Metadata } from "@lichtblick/suite"; /** * Freezes an array of metadata objects and all their internal properties, diff --git a/packages/studio-base/src/players/IterablePlayer/rosdb3/RosDb3IterableSource.ts b/packages/studio-base/src/players/IterablePlayer/rosdb3/RosDb3IterableSource.ts index 37dc4855613..eac4bc4ff48 100644 --- a/packages/studio-base/src/players/IterablePlayer/rosdb3/RosDb3IterableSource.ts +++ b/packages/studio-base/src/players/IterablePlayer/rosdb3/RosDb3IterableSource.ts @@ -2,7 +2,6 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { MessageEvent } from "@lichtblick/studio"; import { estimateObjectSize } from "@lichtblick/studio-base/players/messageMemoryEstimation"; import { MessageDefinitionsByTopic, @@ -13,6 +12,7 @@ import { } from "@lichtblick/studio-base/players/types"; import { RosDatatypes } from "@lichtblick/studio-base/types/RosDatatypes"; import { basicDatatypes } from "@lichtblick/studio-base/util/basicDatatypes"; +import { MessageEvent } from "@lichtblick/suite"; import { ROS2_TO_DEFINITIONS, Rosbag2, SqliteSqljs } from "@foxglove/rosbag2-web"; import { stringify } from "@foxglove/rosmsg"; diff --git a/packages/studio-base/src/players/IterablePlayer/ulog/UlogIterableSource.ts b/packages/studio-base/src/players/IterablePlayer/ulog/UlogIterableSource.ts index b8aed71ac32..24341f84401 100644 --- a/packages/studio-base/src/players/IterablePlayer/ulog/UlogIterableSource.ts +++ b/packages/studio-base/src/players/IterablePlayer/ulog/UlogIterableSource.ts @@ -3,7 +3,6 @@ // file, You can obtain one at http://mozilla.org/MPL/2.0/ import Logger from "@lichtblick/log"; -import { MessageEvent, ParameterValue } from "@lichtblick/studio"; import { MessageDefinitionsByTopic, ParsedMessageDefinitionsByTopic, @@ -12,6 +11,7 @@ import { PlayerProblem, } from "@lichtblick/studio-base/players/types"; import { RosDatatypes } from "@lichtblick/studio-base/types/RosDatatypes"; +import { MessageEvent, ParameterValue } from "@lichtblick/suite"; import { ros1 } from "@foxglove/rosmsg-msgs-common"; import { Time, fromMicros, isTimeInRangeInclusive, toMicroSec } from "@foxglove/rostime"; diff --git a/packages/studio-base/src/players/Ros1Player.ts b/packages/studio-base/src/players/Ros1Player.ts index 38775c8c030..751ac720e11 100644 --- a/packages/studio-base/src/players/Ros1Player.ts +++ b/packages/studio-base/src/players/Ros1Player.ts @@ -4,7 +4,6 @@ import { debouncePromise } from "@lichtblick/den/async"; import Logger from "@lichtblick/log"; -import { ParameterValue } from "@lichtblick/studio"; import OsContextSingleton from "@lichtblick/studio-base/OsContextSingleton"; import PlayerProblemManager from "@lichtblick/studio-base/players/PlayerProblemManager"; import { @@ -24,6 +23,7 @@ import { } from "@lichtblick/studio-base/players/types"; import { RosDatatypes } from "@lichtblick/studio-base/types/RosDatatypes"; import rosDatatypesToMessageDefinition from "@lichtblick/studio-base/util/rosDatatypesToMessageDefinition"; +import { ParameterValue } from "@lichtblick/suite"; import * as _ from "lodash-es"; import { v4 as uuidv4 } from "uuid"; diff --git a/packages/studio-base/src/players/RosbridgePlayer.ts b/packages/studio-base/src/players/RosbridgePlayer.ts index 4c61cdac064..ca6837b40f9 100644 --- a/packages/studio-base/src/players/RosbridgePlayer.ts +++ b/packages/studio-base/src/players/RosbridgePlayer.ts @@ -14,7 +14,6 @@ import { debouncePromise } from "@lichtblick/den/async"; import { filterMap } from "@lichtblick/den/collection"; import Log from "@lichtblick/log"; -import { ParameterValue } from "@lichtblick/studio"; import PlayerProblemManager from "@lichtblick/studio-base/players/PlayerProblemManager"; import { AdvertiseOptions, @@ -32,6 +31,7 @@ import { } from "@lichtblick/studio-base/players/types"; import { RosDatatypes } from "@lichtblick/studio-base/types/RosDatatypes"; import { bagConnectionsToDatatypes } from "@lichtblick/studio-base/util/bagConnectionsHelper"; +import { ParameterValue } from "@lichtblick/suite"; import * as _ from "lodash-es"; import { v4 as uuidv4 } from "uuid"; diff --git a/packages/studio-base/src/players/TopicAliasingPlayer/AliasingStateProcessor.ts b/packages/studio-base/src/players/TopicAliasingPlayer/AliasingStateProcessor.ts index e9026bd93b9..62001659895 100644 --- a/packages/studio-base/src/players/TopicAliasingPlayer/AliasingStateProcessor.ts +++ b/packages/studio-base/src/players/TopicAliasingPlayer/AliasingStateProcessor.ts @@ -2,7 +2,6 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { Immutable as Im, MessageEvent } from "@lichtblick/studio"; import { MessageBlock, PlayerProblem, @@ -12,6 +11,7 @@ import { Topic, TopicStats, } from "@lichtblick/studio-base/players/types"; +import { Immutable as Im, MessageEvent } from "@lichtblick/suite"; import * as _ from "lodash-es"; import memoizeWeak from "memoize-weak"; diff --git a/packages/studio-base/src/players/TopicAliasingPlayer/BlockTopicProcessor.ts b/packages/studio-base/src/players/TopicAliasingPlayer/BlockTopicProcessor.ts index ad61d82aac4..bc0aef1f878 100644 --- a/packages/studio-base/src/players/TopicAliasingPlayer/BlockTopicProcessor.ts +++ b/packages/studio-base/src/players/TopicAliasingPlayer/BlockTopicProcessor.ts @@ -2,8 +2,8 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import type { Immutable as Im, MessageEvent } from "@lichtblick/studio"; import type { MessageBlock } from "@lichtblick/studio-base/players/types"; +import type { Immutable as Im, MessageEvent } from "@lichtblick/suite"; type BlockItem = { inputEvents: Im; aliased: Record }; type SparseArray = (T | undefined)[]; diff --git a/packages/studio-base/src/players/TopicAliasingPlayer/StateProcessorFactory.ts b/packages/studio-base/src/players/TopicAliasingPlayer/StateProcessorFactory.ts index 1e002a70474..e8f81c9cb21 100644 --- a/packages/studio-base/src/players/TopicAliasingPlayer/StateProcessorFactory.ts +++ b/packages/studio-base/src/players/TopicAliasingPlayer/StateProcessorFactory.ts @@ -2,9 +2,9 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { TopicAliasFunction, Immutable as Im } from "@lichtblick/studio"; import { GlobalVariables } from "@lichtblick/studio-base/hooks/useGlobalVariables"; import { PlayerProblem, Topic } from "@lichtblick/studio-base/players/types"; +import { TopicAliasFunction, Immutable as Im } from "@lichtblick/suite"; import * as _ from "lodash-es"; import { AliasingStateProcessor, TopicAliasMap } from "./AliasingStateProcessor"; diff --git a/packages/studio-base/src/players/TopicAliasingPlayer/TopicAliasingPlayer.ts b/packages/studio-base/src/players/TopicAliasingPlayer/TopicAliasingPlayer.ts index f7b3ab8339e..723608b6558 100644 --- a/packages/studio-base/src/players/TopicAliasingPlayer/TopicAliasingPlayer.ts +++ b/packages/studio-base/src/players/TopicAliasingPlayer/TopicAliasingPlayer.ts @@ -3,7 +3,6 @@ // file, You can obtain one at http://mozilla.org/MPL/2.0/ import { MutexLocked } from "@lichtblick/den/async"; -import { Immutable, Metadata, ParameterValue } from "@lichtblick/studio"; import { Asset } from "@lichtblick/studio-base/components/PanelExtensionAdapter"; import { GlobalVariables } from "@lichtblick/studio-base/hooks/useGlobalVariables"; import { @@ -13,6 +12,7 @@ import { PublishPayload, SubscribePayload, } from "@lichtblick/studio-base/players/types"; +import { Immutable, Metadata, ParameterValue } from "@lichtblick/suite"; import * as _ from "lodash-es"; import { Time } from "@foxglove/rostime"; diff --git a/packages/studio-base/src/players/TopicAliasingPlayer/aliasing.test.ts b/packages/studio-base/src/players/TopicAliasingPlayer/aliasing.test.ts index 5e1598418c5..12820cc5875 100644 --- a/packages/studio-base/src/players/TopicAliasingPlayer/aliasing.test.ts +++ b/packages/studio-base/src/players/TopicAliasingPlayer/aliasing.test.ts @@ -2,12 +2,12 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { TopicAliasFunction } from "@lichtblick/studio"; import { AliasingInputs, aliasPlayerState, } from "@lichtblick/studio-base/players/TopicAliasingPlayer/aliasing"; import { Topic } from "@lichtblick/studio-base/players/types"; +import { TopicAliasFunction } from "@lichtblick/suite"; import { mockPlayerState } from "./mocks"; diff --git a/packages/studio-base/src/players/TopicAliasingPlayer/aliasing.ts b/packages/studio-base/src/players/TopicAliasingPlayer/aliasing.ts index e0472d01136..13990cdfb80 100644 --- a/packages/studio-base/src/players/TopicAliasingPlayer/aliasing.ts +++ b/packages/studio-base/src/players/TopicAliasingPlayer/aliasing.ts @@ -2,7 +2,6 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { TopicAliasFunction, Immutable as Im, MessageEvent } from "@lichtblick/studio"; import { GlobalVariables } from "@lichtblick/studio-base/hooks/useGlobalVariables"; import { MessageBlock, @@ -13,6 +12,7 @@ import { Topic, TopicStats, } from "@lichtblick/studio-base/players/types"; +import { TopicAliasFunction, Immutable as Im, MessageEvent } from "@lichtblick/suite"; import * as _ from "lodash-es"; import memoizeWeak from "memoize-weak"; diff --git a/packages/studio-base/src/players/TopicAliasingPlayer/mocks.ts b/packages/studio-base/src/players/TopicAliasingPlayer/mocks.ts index 5e1424a2198..4b4e1feb4a2 100644 --- a/packages/studio-base/src/players/TopicAliasingPlayer/mocks.ts +++ b/packages/studio-base/src/players/TopicAliasingPlayer/mocks.ts @@ -2,12 +2,12 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { MessageEvent } from "@lichtblick/studio"; import { PlayerPresence, PlayerState, PlayerStateActiveData, } from "@lichtblick/studio-base/players/types"; +import { MessageEvent } from "@lichtblick/suite"; export function mockMessage(message: T, fields?: Partial>): MessageEvent { return { diff --git a/packages/studio-base/src/players/UserScriptPlayer/index.ts b/packages/studio-base/src/players/UserScriptPlayer/index.ts index dd60f74597d..d903cc17eb0 100644 --- a/packages/studio-base/src/players/UserScriptPlayer/index.ts +++ b/packages/studio-base/src/players/UserScriptPlayer/index.ts @@ -14,7 +14,6 @@ import { MutexLocked } from "@lichtblick/den/async"; import { filterMap } from "@lichtblick/den/collection"; import Log from "@lichtblick/log"; -import { Metadata, ParameterValue } from "@lichtblick/studio"; import { Asset } from "@lichtblick/studio-base/components/PanelExtensionAdapter"; import { IPerformanceRegistry, @@ -53,6 +52,7 @@ import { RosDatatypes } from "@lichtblick/studio-base/types/RosDatatypes"; import { UserScript, UserScripts } from "@lichtblick/studio-base/types/panels"; import Rpc from "@lichtblick/studio-base/util/Rpc"; import { basicDatatypes } from "@lichtblick/studio-base/util/basicDatatypes"; +import { Metadata, ParameterValue } from "@lichtblick/suite"; import { Mutex } from "async-mutex"; import * as _ from "lodash-es"; import memoizeWeak from "memoize-weak"; diff --git a/packages/studio-base/src/players/UserScriptPlayer/subscriptions.ts b/packages/studio-base/src/players/UserScriptPlayer/subscriptions.ts index e7c5b4cbd0a..0fe23cb674d 100644 --- a/packages/studio-base/src/players/UserScriptPlayer/subscriptions.ts +++ b/packages/studio-base/src/players/UserScriptPlayer/subscriptions.ts @@ -2,9 +2,9 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { Immutable } from "@lichtblick/studio"; import { mergeSubscriptions } from "@lichtblick/studio-base/components/MessagePipeline/subscriptions"; import { SubscribePayload } from "@lichtblick/studio-base/players/types"; +import { Immutable } from "@lichtblick/suite"; import * as R from "ramda"; // A mapping from the subscription to the input topics needed to satisfy diff --git a/packages/studio-base/src/players/VelodynePlayer.ts b/packages/studio-base/src/players/VelodynePlayer.ts index f2719c044f1..4a133bf47d1 100644 --- a/packages/studio-base/src/players/VelodynePlayer.ts +++ b/packages/studio-base/src/players/VelodynePlayer.ts @@ -4,7 +4,6 @@ import { debouncePromise } from "@lichtblick/den/async"; import Logger from "@lichtblick/log"; -import { ParameterValue } from "@lichtblick/studio"; import { GlobalVariables } from "@lichtblick/studio-base/hooks/useGlobalVariables"; import { AdvertiseOptions, @@ -20,6 +19,7 @@ import { TopicStats, } from "@lichtblick/studio-base/players/types"; import { RosDatatypes } from "@lichtblick/studio-base/types/RosDatatypes"; +import { ParameterValue } from "@lichtblick/suite"; import { v4 as uuidv4 } from "uuid"; import { Sockets, UdpRemoteInfo, UdpSocketRenderer } from "@foxglove/electron-socket/renderer"; diff --git a/packages/studio-base/src/players/types.ts b/packages/studio-base/src/players/types.ts index 517fdb9757c..6d0b77368d4 100644 --- a/packages/studio-base/src/players/types.ts +++ b/packages/studio-base/src/players/types.ts @@ -11,13 +11,13 @@ // found at http://www.apache.org/licenses/LICENSE-2.0 // You may not use this file except in compliance with the License. -import { Immutable } from "@lichtblick/studio"; -import type { MessageEvent, Metadata, ParameterValue } from "@lichtblick/studio"; import { Asset } from "@lichtblick/studio-base/components/PanelExtensionAdapter"; import { GlobalVariables } from "@lichtblick/studio-base/hooks/useGlobalVariables"; import { RosDatatypes } from "@lichtblick/studio-base/types/RosDatatypes"; import { Range } from "@lichtblick/studio-base/util/ranges"; import { NotificationSeverity } from "@lichtblick/studio-base/util/sendNotification"; +import type { MessageEvent, Metadata, ParameterValue } from "@lichtblick/suite"; +import { Immutable } from "@lichtblick/suite"; import { MessageDefinition } from "@foxglove/message-definition"; import { Time } from "@foxglove/rostime"; diff --git a/packages/studio-base/src/providers/CurrentLayoutProvider/index.tsx b/packages/studio-base/src/providers/CurrentLayoutProvider/index.tsx index b8c3cb931d7..e51a5035c9d 100644 --- a/packages/studio-base/src/providers/CurrentLayoutProvider/index.tsx +++ b/packages/studio-base/src/providers/CurrentLayoutProvider/index.tsx @@ -4,7 +4,6 @@ import { useShallowMemo } from "@lichtblick/hooks"; import Logger from "@lichtblick/log"; -import { VariableValue } from "@lichtblick/studio"; import { useAnalytics } from "@lichtblick/studio-base/context/AnalyticsContext"; import CurrentLayoutContext, { ICurrentLayout, @@ -34,6 +33,7 @@ import { LayoutManagerEventTypes } from "@lichtblick/studio-base/services/ILayou import { PanelConfig, PlaybackConfig, UserScripts } from "@lichtblick/studio-base/types/panels"; import { windowAppURLState } from "@lichtblick/studio-base/util/appURLState"; import { getPanelTypeFromId } from "@lichtblick/studio-base/util/layout"; +import { VariableValue } from "@lichtblick/suite"; import * as _ from "lodash-es"; import { useSnackbar } from "notistack"; import { useCallback, useEffect, useMemo, useRef, useState } from "react"; diff --git a/packages/studio-base/src/providers/ExtensionCatalogProvider.tsx b/packages/studio-base/src/providers/ExtensionCatalogProvider.tsx index 9d9b9425d95..61471e4eb74 100644 --- a/packages/studio-base/src/providers/ExtensionCatalogProvider.tsx +++ b/packages/studio-base/src/providers/ExtensionCatalogProvider.tsx @@ -3,12 +3,6 @@ // file, You can obtain one at http://mozilla.org/MPL/2.0/ import Logger from "@lichtblick/log"; -import { - ExtensionContext, - ExtensionModule, - RegisterMessageConverterArgs, - TopicAliasFunction, -} from "@lichtblick/studio"; import { ExtensionCatalog, ExtensionCatalogContext, @@ -17,6 +11,12 @@ import { import { TopicAliasFunctions } from "@lichtblick/studio-base/players/TopicAliasingPlayer/aliasing"; import { ExtensionLoader } from "@lichtblick/studio-base/services/ExtensionLoader"; import { ExtensionInfo, ExtensionNamespace } from "@lichtblick/studio-base/types/Extensions"; +import { + ExtensionContext, + ExtensionModule, + RegisterMessageConverterArgs, + TopicAliasFunction, +} from "@lichtblick/suite"; import React, { PropsWithChildren, useEffect, useState } from "react"; import ReactDOM from "react-dom"; import { StoreApi, createStore } from "zustand"; diff --git a/packages/studio-base/src/stories/PanelSetup.tsx b/packages/studio-base/src/stories/PanelSetup.tsx index 52b61cae651..fb19fad0830 100644 --- a/packages/studio-base/src/stories/PanelSetup.tsx +++ b/packages/studio-base/src/stories/PanelSetup.tsx @@ -12,12 +12,6 @@ // You may not use this file except in compliance with the License. import { useShallowMemo } from "@lichtblick/hooks"; -import { - MessageEvent, - ParameterValue, - RegisterMessageConverterArgs, - SettingsTree, -} from "@lichtblick/studio"; import MockMessagePipelineProvider from "@lichtblick/studio-base/components/MessagePipeline/MockMessagePipelineProvider"; import SettingsTreeEditor from "@lichtblick/studio-base/components/SettingsTreeEditor"; import AppConfigurationContext from "@lichtblick/studio-base/context/AppConfigurationContext"; @@ -53,6 +47,12 @@ import WorkspaceContextProvider from "@lichtblick/studio-base/providers/Workspac import ThemeProvider from "@lichtblick/studio-base/theme/ThemeProvider"; import { RosDatatypes } from "@lichtblick/studio-base/types/RosDatatypes"; import { SavedProps, UserScripts } from "@lichtblick/studio-base/types/panels"; +import { + MessageEvent, + ParameterValue, + RegisterMessageConverterArgs, + SettingsTree, +} from "@lichtblick/suite"; import { useTheme } from "@mui/material"; import { TFunction } from "i18next"; import * as _ from "lodash-es"; diff --git a/packages/studio-base/src/test/mocks/mockMessage.ts b/packages/studio-base/src/test/mocks/mockMessage.ts index 6be827a5279..b311468f47a 100644 --- a/packages/studio-base/src/test/mocks/mockMessage.ts +++ b/packages/studio-base/src/test/mocks/mockMessage.ts @@ -2,7 +2,7 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { MessageEvent } from "@lichtblick/studio"; +import { MessageEvent } from "@lichtblick/suite"; /** * Helper function for generating mock messages for tests and stories. diff --git a/packages/studio-base/src/types/Bounds.ts b/packages/studio-base/src/types/Bounds.ts index 92ea31055f4..748c6fd8118 100644 --- a/packages/studio-base/src/types/Bounds.ts +++ b/packages/studio-base/src/types/Bounds.ts @@ -2,7 +2,7 @@ // License, v2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/ -import { Immutable } from "@lichtblick/studio"; +import { Immutable } from "@lichtblick/suite"; export type Bounds1D = { min: number; diff --git a/packages/studio-base/src/util/enums.ts b/packages/studio-base/src/util/enums.ts index 5fda8f25d19..834eca21f0f 100644 --- a/packages/studio-base/src/util/enums.ts +++ b/packages/studio-base/src/util/enums.ts @@ -11,8 +11,8 @@ // found at http://www.apache.org/licenses/LICENSE-2.0 // You may not use this file except in compliance with the License. -import { Immutable } from "@lichtblick/studio"; import { RosDatatypes } from "@lichtblick/studio-base/types/RosDatatypes"; +import { Immutable } from "@lichtblick/suite"; // Exported for tests export const constantsByDatatype = ( diff --git a/packages/studio-base/src/util/time.test.ts b/packages/studio-base/src/util/time.test.ts index b3fe0ecf265..cc7049927ad 100644 --- a/packages/studio-base/src/util/time.test.ts +++ b/packages/studio-base/src/util/time.test.ts @@ -11,7 +11,7 @@ // found at http://www.apache.org/licenses/LICENSE-2.0 // You may not use this file except in compliance with the License. -import { MessageEvent } from "@lichtblick/studio"; +import { MessageEvent } from "@lichtblick/suite"; import * as time from "./time"; diff --git a/packages/studio/README.md b/packages/suite/README.md similarity index 100% rename from packages/studio/README.md rename to packages/suite/README.md diff --git a/packages/studio/package.json b/packages/suite/package.json similarity index 89% rename from packages/studio/package.json rename to packages/suite/package.json index 1c93627acf7..e267434d6ab 100644 --- a/packages/studio/package.json +++ b/packages/suite/package.json @@ -1,10 +1,10 @@ { - "name": "@lichtblick/studio", + "name": "@lichtblick/suite", "version": "1.3.1", "license": "MPL-2.0", "repository": { "type": "git", - "url": "https://github.com/bmw-software-engineering/lichtblick/tree/main/packages/studio" + "url": "https://github.com/bmw-software-engineering/lichtblick/tree/main/packages/suite" }, "author": { "name": "Lichtblick", diff --git a/packages/studio/src/immutable.ts b/packages/suite/src/immutable.ts similarity index 100% rename from packages/studio/src/immutable.ts rename to packages/suite/src/immutable.ts diff --git a/packages/studio/src/index.ts b/packages/suite/src/index.ts similarity index 100% rename from packages/studio/src/index.ts rename to packages/suite/src/index.ts diff --git a/packages/studio/tsconfig.json b/packages/suite/tsconfig.json similarity index 100% rename from packages/studio/tsconfig.json rename to packages/suite/tsconfig.json diff --git a/yarn.lock b/yarn.lock index f6712055db2..6d8d3b3b366 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3400,7 +3400,7 @@ __metadata: "@lichtblick/den": "workspace:*" "@lichtblick/hooks": "workspace:*" "@lichtblick/log": "workspace:*" - "@lichtblick/studio": "workspace:*" + "@lichtblick/suite": "workspace:*" "@mcap/core": 2.0.2 "@mui/icons-material": 5.15.5 "@mui/material": 5.13.5 @@ -3534,15 +3534,6 @@ __metadata: languageName: unknown linkType: soft -"@lichtblick/studio@workspace:*, @lichtblick/studio@workspace:packages/studio": - version: 0.0.0-use.local - resolution: "@lichtblick/studio@workspace:packages/studio" - dependencies: - "@foxglove/tsconfig": 2.0.0 - typescript: 5.3.3 - languageName: unknown - linkType: soft - "@lichtblick/suite-desktop@workspace:*, @lichtblick/suite-desktop@workspace:packages/suite-desktop": version: 0.0.0-use.local resolution: "@lichtblick/suite-desktop@workspace:packages/suite-desktop" @@ -3622,6 +3613,15 @@ __metadata: languageName: unknown linkType: soft +"@lichtblick/suite@workspace:*, @lichtblick/suite@workspace:packages/suite": + version: 0.0.0-use.local + resolution: "@lichtblick/suite@workspace:packages/suite" + dependencies: + "@foxglove/tsconfig": 2.0.0 + typescript: 5.3.3 + languageName: unknown + linkType: soft + "@malept/cross-spawn-promise@npm:^1.1.0": version: 1.1.1 resolution: "@malept/cross-spawn-promise@npm:1.1.1" @@ -9067,8 +9067,8 @@ __metadata: "@foxglove/tsconfig": 2.0.0 "@lichtblick/den": "workspace:*" "@lichtblick/log": "workspace:*" - "@lichtblick/studio": "workspace:*" "@lichtblick/studio-base": "workspace:*" + "@lichtblick/suite": "workspace:*" "@pmmmwh/react-refresh-webpack-plugin": 0.5.11 "@types/react": 18.2.56 "@types/react-dom": 18.2.7 @@ -16313,7 +16313,7 @@ __metadata: "@foxglove/tsconfig": 2.0.0 "@lichtblick/hooks": "workspace:*" "@lichtblick/log": "workspace:*" - "@lichtblick/studio": "workspace:*" + "@lichtblick/suite": "workspace:*" "@mui/material": 5.13.5 "@octokit/rest": 20.0.2 "@storybook/addon-actions": 7.6.10