Merge remote-tracking branch 'upstream/main'

src/lib/utils.test.ts

@@ -0,0 +1,40 @@
+import { expect, test } from "vitest";
+
+import { fileUrlToAssetUrl } from "./utils";
+
+test("fileUrlToAssetUrl", () => {
+  expect(
+    fileUrlToAssetUrl("https://example.com/image.png?X-Amz-Expires=1", ""),
+  ).toBe("/static/image.webp");
+  expect(
+    fileUrlToAssetUrl(
+      "https://example.com/image.png?X-Amz-Expires=1",
+      "blockId",
+    ),
+  ).toBe("/static/blockId.webp");
+
+  expect(
+    fileUrlToAssetUrl("https://example.com/foobar?X-Amz-Expires=1", "blockId"),
+  ).toBe("/static/blockId.webp");
+  expect(
+    fileUrlToAssetUrl("https://example.com/foobar?X-Amz-Expires=1", ""),
+  ).toBe("/static/foobar");
+
+  expect(
+    fileUrlToAssetUrl(
+      "https://images.unsplash.com/photo-1514519273132-6a1abd48302c?ixlib=rb-4.0.3&q=85&fm=jpg&crop=entropy&cs=srgb&w=6000",
+      "blockId",
+    ),
+  ).toBe("/static/blockId.webp");
+  expect(
+    fileUrlToAssetUrl(
+      "https://images.unsplash.com/photo-1514519273132-6a1abd48302c?ixlib=rb-4.0.3&q=85&fm=jpg&crop=entropy&cs=srgb&w=6000",
+      "",
+    ),
+  ).toBe("/static/photo-1514519273132-6a1abd48302c");
+
+  expect(fileUrlToAssetUrl("https://example.com", "blockId")).toBeUndefined();
+  expect(fileUrlToAssetUrl("https://example.com", "")).toBeUndefined();
+  expect(fileUrlToAssetUrl(undefined, "blockId")).toBeUndefined();
+  expect(fileUrlToAssetUrl(undefined, "")).toBeUndefined();
+});

src/lib/utils.ts

@@ -80,7 +80,9 @@ export function fileUrlToAssetUrl(
   if (!imageUrl) return undefined; // should not download
 
   const url = new URL(imageUrl);
-  if (!url.searchParams.has("X-Amz-Expires")) return undefined; // should not download
+  if (!url.searchParams.has("X-Amz-Expires") && !isUnsplash(url)) {
+    return undefined; // should not download
+  }
 
   const filename = url.pathname.split("/").at(-1);
   if (!filename) return imageUrl;
@@ -97,4 +99,8 @@ export function fileUrlToAssetUrl(
   return newUrl;
 }
 
+function isUnsplash(url: URL): boolean {
+  return url.hostname === "images.unsplash.com";
+}
+
 export const assetsDir = "/static";