fix(source): fix invalid hash ssr/client

basics · Feb 8, 2024 · 5ba987c · 5ba987c
1 parent 8df19c3
commit 5ba987c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/src/runtime/components/SpeedkitImage/classes/Source.js b/src/runtime/components/SpeedkitImage/classes/Source.js
@@ -52,7 +52,7 @@ export default class Source {
   }
 
   get className() {
-    return `image-${toHashHex(this.src)}`;
+    return `image-${toHashHex(normalizeSrc(this.src))}`;
   }
 
   get style() {
@@ -124,3 +124,11 @@ function getFormat(src, format) {
   }
   return format || extension;
 }
+
+export function normalizeSrc(src) {
+  if (src.startsWith('/')) {
+    return src;
+  }
+  const url = new URL(src);
+  return url.pathname + url.search + url.hash;
+}
diff --git a/src/runtime/components/SpeedkitPicture/classes/SourceList.js b/src/runtime/components/SpeedkitPicture/classes/SourceList.js
@@ -1,4 +1,4 @@
-import Source from '../../SpeedkitImage/classes/Source';
+import Source, { normalizeSrc } from '../../SpeedkitImage/classes/Source';
 import createSort from '#speedkit/externals/create-sort';
 import { toHashHex } from '#speedkit/utils/string';
 
@@ -52,7 +52,7 @@ export default class SourceList {
   }
 
   get className() {
-    return `picture-${toHashHex(this.sorted.map(({ src }) => src).join(','))}`;
+    return `picture-${toHashHex(this.sorted.map(({ src }) => normalizeSrc(src)).join(','))}`;
   }
 
   get classNames() {