From 7fe7c88342704559276b7de75a34d6e8dcd20939 Mon Sep 17 00:00:00 2001 From: Lakshmi Tanmay Date: Fri, 20 Nov 2026 11:13:30 +0530 Subject: [PATCH] perf(web): avoid downloading the HEIC decoder twice --- apps/web/src/components/files/imageDecode.worker.ts | 8 ++++---- apps/web/src/lib/heicDecoder.ts | 6 ++++++ apps/web/src/lib/imageCompression.test.ts | 4 ++-- apps/web/src/lib/imageCompression.ts | 3 ++- apps/web/vite.config.ts | 1 - 5 files changed, 14 insertions(+), 8 deletions(-) create mode 100644 apps/web/src/lib/heicDecoder.ts diff --git a/apps/web/src/components/files/imageDecode.worker.ts b/apps/web/src/components/files/imageDecode.worker.ts index f19174b62af35..7bd111cebb85d 100644 --- a/apps/web/src/components/files/imageDecode.worker.ts +++ b/apps/web/src/components/files/imageDecode.worker.ts @@ -1,4 +1,5 @@ import { PreviewError, previewFailure } from "./previewFailure"; +import { loadHeicDecoder } from "../../lib/heicDecoder"; const MAX_PIXELS = 32_000_000; @@ -158,18 +159,17 @@ async function decode(bytes: ArrayBuffer, heif: boolean) { if (bytes.byteLength > 50 * 1024 * 1024) throw new PreviewError({ code: "file-too-large" }); if (heif) { validateHeif(bytes); - // Desktop CSP forbids the JavaScript evaluation used by heic-to/next. - const { heicTo } = await import("heic-to/csp"); + const { heicTo } = await loadHeicDecoder(); const bitmap = await heicTo({ blob: new Blob([bytes]), type: "bitmap" }); + const canvas = new OffscreenCanvas(bitmap.width, bitmap.height); try { - const canvas = new OffscreenCanvas(bitmap.width, bitmap.height); const context = canvas.getContext("2d"); if (!context) throw new PreviewError({ code: "image-decoding-unavailable" }); context.drawImage(bitmap, 0, 0); - return await canvas.convertToBlob({ type: "image/png" }); } finally { bitmap.close(); } + return await canvas.convertToBlob({ type: "image/png" }); } const { decode: decodeTiff } = await import("tiff"); validateTiffMetadata(bytes); diff --git a/apps/web/src/lib/heicDecoder.ts b/apps/web/src/lib/heicDecoder.ts new file mode 100644 index 0000000000000..5dc6744529fac --- /dev/null +++ b/apps/web/src/lib/heicDecoder.ts @@ -0,0 +1,6 @@ +import decoderUrl from "heic-to/csp?url"; + +// Emit one unchanged module so the main and worker builds share the same decoder asset. +export function loadHeicDecoder(): Promise { + return import(/* @vite-ignore */ decoderUrl); +} diff --git a/apps/web/src/lib/imageCompression.test.ts b/apps/web/src/lib/imageCompression.test.ts index e40c3968bc850..cc0a069214ff4 100644 --- a/apps/web/src/lib/imageCompression.test.ts +++ b/apps/web/src/lib/imageCompression.test.ts @@ -19,8 +19,8 @@ const mocks = vi.hoisted(() => ({ heicTo: vi.fn(), })); -vi.mock("heic-to/csp", () => ({ - heicTo: mocks.heicTo, +vi.mock("./heicDecoder", () => ({ + loadHeicDecoder: async () => ({ heicTo: mocks.heicTo }), })); const originalCreateImageBitmap = globalThis.createImageBitmap; diff --git a/apps/web/src/lib/imageCompression.ts b/apps/web/src/lib/imageCompression.ts index b876ceff6a44a..449377ff12b94 100644 --- a/apps/web/src/lib/imageCompression.ts +++ b/apps/web/src/lib/imageCompression.ts @@ -1,3 +1,4 @@ +import { loadHeicDecoder } from "./heicDecoder"; import { downscalableImageMimeType, fitImageAttachmentSize, @@ -513,7 +514,7 @@ async function convertHeicImage( ? await createImageBitmap(file).catch(() => undefined) : undefined; if (!bitmap) { - const { heicTo } = await import("heic-to/csp"); + const { heicTo } = await loadHeicDecoder(); bitmap = await heicTo({ blob: file, type: "bitmap" }); } const imageSize = fitImageAttachmentSize(bitmap) ?? { diff --git a/apps/web/vite.config.ts b/apps/web/vite.config.ts index 073fca7943d3e..5c3567092ac96 100644 --- a/apps/web/vite.config.ts +++ b/apps/web/vite.config.ts @@ -124,7 +124,6 @@ const browserTestProject = { "fast-xml-parser", "entities", "dompurify", - "heic-to/csp", "jszip", "pdfjs-dist", "sql.js",