Fix some issues with assets with root dir path

Close #289
sveltia · Jan 4, 2025 · f2f39dd · f2f39dd
1 parent 762706f
commit f2f39dd
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/src/lib/services/assets/index.js b/src/lib/services/assets/index.js
@@ -342,17 +342,14 @@ export const getAssetByPath = (savedPath, { entry, collection } = {}) => {
     return exactMatch;
   }
 
-  const { dirname: publicPath, basename: fileName } = getPathInfo(savedPath);
-
-  if (!publicPath) {
-    return undefined;
-  }
+  const { dirname: publicPath = '', basename: fileName } = getPathInfo(savedPath);
 
   // eslint-disable-next-line prefer-const
-  let { internalPath, collectionName } =
-    get(allAssetFolders).findLast((folder) =>
-      publicPath.match(`^${folder.publicPath.replace(/{{.+?}}/g, '.+?')}\\b`),
-    ) ?? {};
+  let { internalPath, collectionName } = !publicPath
+    ? get(allAssetFolders)[0] // Global asset folder
+    : (get(allAssetFolders).findLast((folder) =>
+        publicPath.match(`^${folder.publicPath.replace(/{{.+?}}/g, '.+?')}\\b`),
+      ) ?? {});
 
   if (internalPath === undefined) {
     return undefined;
@@ -434,7 +431,7 @@ export const getAssetPublicURL = (
     return undefined;
   }
 
-  const path = asset.path.replace(asset.folder, publicPath ?? '');
+  const path = asset.path.replace(asset.folder, publicPath === '/' ? '' : (publicPath ?? ''));
 
   // Path starting with `@`, etc. cannot be linked
   if (!path.startsWith('/') && !allowSpecial) {
@@ -445,7 +442,7 @@ export const getAssetPublicURL = (
     return path;
   }
 
-  const baseURL = get(siteConfig)?.site_url ?? '';
+  const baseURL = stripSlashes(get(siteConfig)?.site_url ?? '');
 
   return `${baseURL}${path}`;
 };

diff --git a/src/lib/services/contents/draft/save.js b/src/lib/services/contents/draft/save.js
@@ -647,7 +647,6 @@ const replaceBlobURL = async ({
 
   const sha = await getHash(file);
   const dupFile = savingAssets.find((f) => f.sha === sha);
-  const useSubFolder = !!publicAssetFolder && publicAssetFolder !== '/';
   let assetName = '';
 
   // Check if the file has already been added for other field or locale
@@ -676,7 +675,11 @@ const replaceBlobURL = async ({
     blobURL,
     (_match, /** @type {number} */ offset) => {
       if (offset === index) {
-        return useSubFolder ? `${publicAssetFolder}/${assetName}` : assetName;
+        if (publicAssetFolder) {
+          return `${publicAssetFolder === '/' ? '' : publicAssetFolder}/${assetName}`;
+        }
+
+        return assetName;
       }
 
       return _match;