diff --git a/packages/comlink-transfer-handlers/package.json b/packages/comlink-transfer-handlers/package.json index 7e4845d593..5f63393101 100644 --- a/packages/comlink-transfer-handlers/package.json +++ b/packages/comlink-transfer-handlers/package.json @@ -20,8 +20,8 @@ "prepack": "tsc -b" }, "devDependencies": { + "@lichtblick/comlink": "1.0.3", "@lichtblick/tsconfig": "1.0.0", - "comlink": "github:lichtblick-suite/comlink#1f0271445730e68172b4d5d1dc9b9e74d0db241e", "typescript": "5.3.3" } } diff --git a/packages/comlink-transfer-handlers/src/abortSignalTransferHandler.ts b/packages/comlink-transfer-handlers/src/abortSignalTransferHandler.ts index 8f36c05569..a74c7b316f 100644 --- a/packages/comlink-transfer-handlers/src/abortSignalTransferHandler.ts +++ b/packages/comlink-transfer-handlers/src/abortSignalTransferHandler.ts @@ -5,7 +5,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 { TransferHandler } from "comlink"; +import type { TransferHandler } from "@lichtblick/comlink"; const isAbortSignal = (val: unknown): val is AbortSignal => val instanceof AbortSignal; diff --git a/packages/den/package.json b/packages/den/package.json index cd9e2b768b..cc0eb61a09 100644 --- a/packages/den/package.json +++ b/packages/den/package.json @@ -13,8 +13,8 @@ }, "homepage": "https://github.com/lichtblick-suite", "dependencies": { + "@lichtblick/comlink": "1.0.3", "async-mutex": "0.4.0", - "comlink": "github:lichtblick-suite/comlink#1f0271445730e68172b4d5d1dc9b9e74d0db241e", "xacro-parser": "0.3.9" }, "devDependencies": { diff --git a/packages/den/testing/makeComlinkWorkerMock.ts b/packages/den/testing/makeComlinkWorkerMock.ts index fdedb97f5d..6448d624ed 100644 --- a/packages/den/testing/makeComlinkWorkerMock.ts +++ b/packages/den/testing/makeComlinkWorkerMock.ts @@ -5,9 +5,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 * as Comlink from "comlink"; import { EventEmitter } from "node:events"; +import * as Comlink from "@lichtblick/comlink"; + type ComlinkWorkerConstructor = new () => Comlink.Endpoint; /** diff --git a/packages/den/worker/ComlinkWrap.ts b/packages/den/worker/ComlinkWrap.ts index 23d85244f6..35e4dcc01c 100644 --- a/packages/den/worker/ComlinkWrap.ts +++ b/packages/den/worker/ComlinkWrap.ts @@ -5,7 +5,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 * as Comlink from "comlink"; +import * as Comlink from "@lichtblick/comlink"; /** * Wraps an instantiated `Worker` and exposes its API in the same way that `Comlink.wrap` does diff --git a/packages/suite-base/package.json b/packages/suite-base/package.json index 691462dd24..70d0d81272 100644 --- a/packages/suite-base/package.json +++ b/packages/suite-base/package.json @@ -24,6 +24,7 @@ "@foxglove/ws-protocol": "0.7.2", "@lichtblick/avl": "1.0.0", "@lichtblick/chartjs-plugin-zoom": "1.0.0", + "@lichtblick/comlink": "1.0.3", "@lichtblick/comlink-transfer-handlers": "workspace:*", "@lichtblick/crc": "1.0.0", "@lichtblick/den": "workspace:*", @@ -99,7 +100,6 @@ "chartjs-plugin-annotation": "3.0.1", "chartjs-plugin-datalabels": "2.2.0", "chromatic": "11.5.6", - "comlink": "github:lichtblick-suite/comlink#1f0271445730e68172b4d5d1dc9b9e74d0db241e", "crypto-browserify": "3.12.0", "css-loader": "6.8.1", "cytoscape": "3.28.1", diff --git a/packages/suite-base/src/panels/Plot/ChartRenderer.worker.ts b/packages/suite-base/src/panels/Plot/ChartRenderer.worker.ts index 28cabfc6e1..106a84be6b 100644 --- a/packages/suite-base/src/panels/Plot/ChartRenderer.worker.ts +++ b/packages/suite-base/src/panels/Plot/ChartRenderer.worker.ts @@ -19,8 +19,8 @@ import { Tooltip, } from "chart.js"; import AnnotationPlugin from "chartjs-plugin-annotation"; -import * as Comlink from "comlink"; +import * as Comlink from "@lichtblick/comlink"; import PlexMono from "@lichtblick/suite-base/styles/assets/PlexMono.woff2"; import { ChartRenderer } from "./ChartRenderer"; diff --git a/packages/suite-base/src/panels/Plot/OffscreenCanvasRenderer.ts b/packages/suite-base/src/panels/Plot/OffscreenCanvasRenderer.ts index 02232eeffa..9ee7820f8a 100644 --- a/packages/suite-base/src/panels/Plot/OffscreenCanvasRenderer.ts +++ b/packages/suite-base/src/panels/Plot/OffscreenCanvasRenderer.ts @@ -6,8 +6,8 @@ // file, You can obtain one at http://mozilla.org/MPL/2.0/ import type { Theme } from "@mui/material"; -import * as Comlink from "comlink"; +import * as Comlink from "@lichtblick/comlink"; import { ComlinkWrap } from "@lichtblick/den/worker"; import { Immutable } from "@lichtblick/suite"; import { Bounds } from "@lichtblick/suite-base/types/Bounds"; diff --git a/packages/suite-base/src/panels/Plot/builders/CustomDatasetsBuilder.ts b/packages/suite-base/src/panels/Plot/builders/CustomDatasetsBuilder.ts index 7bad4944cb..78f6cbe2ee 100644 --- a/packages/suite-base/src/panels/Plot/builders/CustomDatasetsBuilder.ts +++ b/packages/suite-base/src/panels/Plot/builders/CustomDatasetsBuilder.ts @@ -5,8 +5,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 * as Comlink from "comlink"; - +import * as Comlink from "@lichtblick/comlink"; import { ComlinkWrap } from "@lichtblick/den/worker"; import { MessagePath } from "@lichtblick/message-path"; import { Immutable, MessageEvent } from "@lichtblick/suite"; diff --git a/packages/suite-base/src/panels/Plot/builders/CustomDatasetsBuilderImpl.worker.ts b/packages/suite-base/src/panels/Plot/builders/CustomDatasetsBuilderImpl.worker.ts index c6742eb75a..63664d9d88 100644 --- a/packages/suite-base/src/panels/Plot/builders/CustomDatasetsBuilderImpl.worker.ts +++ b/packages/suite-base/src/panels/Plot/builders/CustomDatasetsBuilderImpl.worker.ts @@ -5,7 +5,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 * as Comlink from "comlink"; +import * as Comlink from "@lichtblick/comlink"; import { CustomDatasetsBuilderImpl } from "./CustomDatasetsBuilderImpl"; diff --git a/packages/suite-base/src/panels/Plot/builders/TimestampDatasetsBuilder.ts b/packages/suite-base/src/panels/Plot/builders/TimestampDatasetsBuilder.ts index 1fc43184f9..7bb3af5d18 100644 --- a/packages/suite-base/src/panels/Plot/builders/TimestampDatasetsBuilder.ts +++ b/packages/suite-base/src/panels/Plot/builders/TimestampDatasetsBuilder.ts @@ -5,8 +5,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 * as Comlink from "comlink"; - +import * as Comlink from "@lichtblick/comlink"; import { ComlinkWrap } from "@lichtblick/den/worker"; import { MessagePath } from "@lichtblick/message-path"; import { toSec, subtract as subtractTime } from "@lichtblick/rostime"; diff --git a/packages/suite-base/src/panels/Plot/builders/TimestampDatasetsBuilderImpl.worker.ts b/packages/suite-base/src/panels/Plot/builders/TimestampDatasetsBuilderImpl.worker.ts index 1c4fb5ecbe..d419f1dec1 100644 --- a/packages/suite-base/src/panels/Plot/builders/TimestampDatasetsBuilderImpl.worker.ts +++ b/packages/suite-base/src/panels/Plot/builders/TimestampDatasetsBuilderImpl.worker.ts @@ -5,7 +5,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 * as Comlink from "comlink"; +import * as Comlink from "@lichtblick/comlink"; import { TimestampDatasetsBuilderImpl } from "./TimestampDatasetsBuilderImpl"; diff --git a/packages/suite-base/src/panels/ThreeDeeRender/renderables/Images/WorkerImageDecoder.ts b/packages/suite-base/src/panels/ThreeDeeRender/renderables/Images/WorkerImageDecoder.ts index 74fb51f64f..183b639e03 100644 --- a/packages/suite-base/src/panels/ThreeDeeRender/renderables/Images/WorkerImageDecoder.ts +++ b/packages/suite-base/src/panels/ThreeDeeRender/renderables/Images/WorkerImageDecoder.ts @@ -6,8 +6,8 @@ // file, You can obtain one at http://mozilla.org/MPL/2.0/ import { RawImage } from "@foxglove/schemas"; -import * as Comlink from "comlink"; +import * as Comlink from "@lichtblick/comlink"; import { ComlinkWrap } from "@lichtblick/den/worker"; import type { RawImageOptions } from "./decodeImage"; diff --git a/packages/suite-base/src/panels/ThreeDeeRender/renderables/Images/WorkerImageDecoder.worker.ts b/packages/suite-base/src/panels/ThreeDeeRender/renderables/Images/WorkerImageDecoder.worker.ts index eca269382d..f41642d031 100644 --- a/packages/suite-base/src/panels/ThreeDeeRender/renderables/Images/WorkerImageDecoder.worker.ts +++ b/packages/suite-base/src/panels/ThreeDeeRender/renderables/Images/WorkerImageDecoder.worker.ts @@ -6,7 +6,8 @@ // file, You can obtain one at http://mozilla.org/MPL/2.0/ import type { RawImage } from "@foxglove/schemas"; -import * as Comlink from "comlink"; + +import * as Comlink from "@lichtblick/comlink"; import { decodeRawImage, RawImageOptions } from "./decodeImage"; import type { Image as RosImage } from "../../ros"; diff --git a/packages/suite-base/src/players/IterablePlayer/BagIterableSourceWorker.worker.ts b/packages/suite-base/src/players/IterablePlayer/BagIterableSourceWorker.worker.ts index 43ee0e4aeb..9195d019fa 100644 --- a/packages/suite-base/src/players/IterablePlayer/BagIterableSourceWorker.worker.ts +++ b/packages/suite-base/src/players/IterablePlayer/BagIterableSourceWorker.worker.ts @@ -5,8 +5,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 * as Comlink from "comlink"; - +import * as Comlink from "@lichtblick/comlink"; import { IterableSourceInitializeArgs } from "@lichtblick/suite-base/players/IterablePlayer/IIterableSource"; import { WorkerIterableSourceWorker } from "@lichtblick/suite-base/players/IterablePlayer/WorkerIterableSourceWorker"; diff --git a/packages/suite-base/src/players/IterablePlayer/Mcap/McapIterableSourceWorker.worker.ts b/packages/suite-base/src/players/IterablePlayer/Mcap/McapIterableSourceWorker.worker.ts index 97c3861d53..8dd952aeb0 100644 --- a/packages/suite-base/src/players/IterablePlayer/Mcap/McapIterableSourceWorker.worker.ts +++ b/packages/suite-base/src/players/IterablePlayer/Mcap/McapIterableSourceWorker.worker.ts @@ -5,8 +5,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 * as Comlink from "comlink"; - +import * as Comlink from "@lichtblick/comlink"; import { IterableSourceInitializeArgs } from "@lichtblick/suite-base/players/IterablePlayer/IIterableSource"; import { WorkerIterableSourceWorker } from "@lichtblick/suite-base/players/IterablePlayer/WorkerIterableSourceWorker"; diff --git a/packages/suite-base/src/players/IterablePlayer/WorkerIterableSource.ts b/packages/suite-base/src/players/IterablePlayer/WorkerIterableSource.ts index 642fce98ba..efc7492995 100644 --- a/packages/suite-base/src/players/IterablePlayer/WorkerIterableSource.ts +++ b/packages/suite-base/src/players/IterablePlayer/WorkerIterableSource.ts @@ -5,8 +5,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 * as Comlink from "comlink"; - +import * as Comlink from "@lichtblick/comlink"; import { abortSignalTransferHandler } from "@lichtblick/comlink-transfer-handlers"; import { ComlinkWrap } from "@lichtblick/den/worker"; import { Immutable, MessageEvent, Time } from "@lichtblick/suite"; diff --git a/packages/suite-base/src/players/IterablePlayer/WorkerIterableSourceWorker.ts b/packages/suite-base/src/players/IterablePlayer/WorkerIterableSourceWorker.ts index 7906c68245..ec421e1fa8 100644 --- a/packages/suite-base/src/players/IterablePlayer/WorkerIterableSourceWorker.ts +++ b/packages/suite-base/src/players/IterablePlayer/WorkerIterableSourceWorker.ts @@ -5,8 +5,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 * as Comlink from "comlink"; - +import * as Comlink from "@lichtblick/comlink"; import { abortSignalTransferHandler } from "@lichtblick/comlink-transfer-handlers"; import { Immutable, MessageEvent } from "@lichtblick/suite"; diff --git a/packages/suite-base/src/players/IterablePlayer/rosdb3/RosDb3IterableSourceWorker.worker.ts b/packages/suite-base/src/players/IterablePlayer/rosdb3/RosDb3IterableSourceWorker.worker.ts index d99ffd1c73..defb011fda 100644 --- a/packages/suite-base/src/players/IterablePlayer/rosdb3/RosDb3IterableSourceWorker.worker.ts +++ b/packages/suite-base/src/players/IterablePlayer/rosdb3/RosDb3IterableSourceWorker.worker.ts @@ -5,8 +5,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 * as Comlink from "comlink"; - +import * as Comlink from "@lichtblick/comlink"; import { IterableSourceInitializeArgs } from "@lichtblick/suite-base/players/IterablePlayer/IIterableSource"; import { WorkerIterableSourceWorker } from "@lichtblick/suite-base/players/IterablePlayer/WorkerIterableSourceWorker"; diff --git a/packages/suite-base/src/players/IterablePlayer/ulog/UlogIterableSourceWorker.worker.ts b/packages/suite-base/src/players/IterablePlayer/ulog/UlogIterableSourceWorker.worker.ts index 47c748cd55..90a112f159 100644 --- a/packages/suite-base/src/players/IterablePlayer/ulog/UlogIterableSourceWorker.worker.ts +++ b/packages/suite-base/src/players/IterablePlayer/ulog/UlogIterableSourceWorker.worker.ts @@ -5,8 +5,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 * as Comlink from "comlink"; - +import * as Comlink from "@lichtblick/comlink"; import { IterableSourceInitializeArgs } from "@lichtblick/suite-base/players/IterablePlayer/IIterableSource"; import { WorkerIterableSourceWorker } from "@lichtblick/suite-base/players/IterablePlayer/WorkerIterableSourceWorker"; diff --git a/yarn.lock b/yarn.lock index 687704e34e..9ec1cba3c2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2990,12 +2990,19 @@ __metadata: version: 0.0.0-use.local resolution: "@lichtblick/comlink-transfer-handlers@workspace:packages/comlink-transfer-handlers" dependencies: + "@lichtblick/comlink": 1.0.3 "@lichtblick/tsconfig": 1.0.0 - comlink: "github:lichtblick-suite/comlink#1f0271445730e68172b4d5d1dc9b9e74d0db241e" typescript: 5.3.3 languageName: unknown linkType: soft +"@lichtblick/comlink@npm:1.0.3": + version: 1.0.3 + resolution: "@lichtblick/comlink@npm:1.0.3" + checksum: 9c70e38325624932205e7d7a634f714fc84ce3b14c4dfbba22d9a909d9cc82bedff1a39159e8491c16a6c34f5825240f1ae5ad08b7ee7d525a3ca361ec5f7433 + languageName: node + linkType: hard + "@lichtblick/crc@npm:1.0.0": version: 1.0.0 resolution: "@lichtblick/crc@npm:1.0.0" @@ -3007,9 +3014,9 @@ __metadata: version: 0.0.0-use.local resolution: "@lichtblick/den@workspace:packages/den" dependencies: + "@lichtblick/comlink": 1.0.3 "@lichtblick/tsconfig": 1.0.0 async-mutex: 0.4.0 - comlink: "github:lichtblick-suite/comlink#1f0271445730e68172b4d5d1dc9b9e74d0db241e" xacro-parser: 0.3.9 languageName: unknown linkType: soft @@ -3269,6 +3276,7 @@ __metadata: "@foxglove/ws-protocol": 0.7.2 "@lichtblick/avl": 1.0.0 "@lichtblick/chartjs-plugin-zoom": 1.0.0 + "@lichtblick/comlink": 1.0.3 "@lichtblick/comlink-transfer-handlers": "workspace:*" "@lichtblick/crc": 1.0.0 "@lichtblick/den": "workspace:*" @@ -3344,7 +3352,6 @@ __metadata: chartjs-plugin-annotation: 3.0.1 chartjs-plugin-datalabels: 2.2.0 chromatic: 11.5.6 - comlink: "github:lichtblick-suite/comlink#1f0271445730e68172b4d5d1dc9b9e74d0db241e" crypto-browserify: 3.12.0 css-loader: 6.8.1 cytoscape: 3.28.1 @@ -10014,13 +10021,6 @@ __metadata: languageName: node linkType: hard -"comlink@github:lichtblick-suite/comlink#1f0271445730e68172b4d5d1dc9b9e74d0db241e": - version: 4.4.1 - resolution: "comlink@https://github.com/lichtblick-suite/comlink.git#commit=1f0271445730e68172b4d5d1dc9b9e74d0db241e" - checksum: d8fe91d88a7b07395c371ae365a08e142310438a42fdf0cf28a05f5a29a4f09fff6d08192e95b38574d0230e7e89ad2f4f8b748cf289fd601602bf0ff889c536 - languageName: node - linkType: hard - "comma-separated-tokens@npm:^2.0.0": version: 2.0.3 resolution: "comma-separated-tokens@npm:2.0.3"