Fix normalization of collection asset folder path

sveltia · Dec 24, 2024 · f1474f4 · f1474f4
1 parent abb0005
commit f1474f4
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/src/lib/services/config.js b/src/lib/services/config.js
@@ -301,12 +301,18 @@ siteConfig.subscribe((config) => {
           mediaFolder.startsWith('/') || mediaFolder.startsWith(globalMediaFolder)
         );
 
+        let publicPath = stripSlashes(
+          (publicFolder ?? mediaFolder).replace('{{public_folder}}', globalPublicFolder).trim(),
+        );
+
+        // Prefix the public path with `/` unless it’s empty or starting with `.` (entry-relative
+        // setting) or starting with `@` (framework-specific)
+        publicPath = publicPath === '' || publicPath.match(/^[.@]/) ? publicPath : `/${publicPath}`;
+
         return {
           collectionName,
           internalPath: stripSlashes(entryRelative ? (collectionFolder ?? '') : mediaFolder),
-          publicPath: `/${stripSlashes(
-            (publicFolder ?? mediaFolder).replace('{{public_folder}}', globalPublicFolder),
-          )}`,
+          publicPath,
           entryRelative,
         };
       })