fix: apply baseUrl to relative image

facebook · Aug 23, 2024 · c9d04f7 · c9d04f7
1 parent 349a584
commit c9d04f7
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 1 deletion.
diff --git a/...ges/docusaurus-plugin-content-blog/src/__tests__/__fixtures__/authorsMapFiles/authors.yml b/...ges/docusaurus-plugin-content-blog/src/__tests__/__fixtures__/authorsMapFiles/authors.yml
diff --git a/packages/docusaurus-plugin-content-blog/src/__tests__/authorsMap.test.ts b/packages/docusaurus-plugin-content-blog/src/__tests__/authorsMap.test.ts
@@ -80,6 +80,7 @@ describe('getAuthorsMap', () => {
         contentPaths,
         authorsMapPath: 'authors.yml',
         authorsBaseRoutePath: '/authors',
+        baseUrl: '/',
       }),
     ).resolves.toBeDefined();
   });
@@ -90,6 +91,7 @@ describe('getAuthorsMap', () => {
         contentPaths,
         authorsMapPath: 'authors.json',
         authorsBaseRoutePath: '/authors',
+        baseUrl: '/',
       }),
     ).resolves.toBeDefined();
   });
@@ -100,9 +102,21 @@ describe('getAuthorsMap', () => {
         contentPaths,
         authorsMapPath: 'authors_does_not_exist.yml',
         authorsBaseRoutePath: '/authors',
+        baseUrl: '/',
       }),
     ).resolves.toBeUndefined();
   });
+
+  it('getAuthorsMap can return img with relative path if baseUrl is set', async () => {
+    const authorsMap = await getAuthorsMap({
+      contentPaths,
+      authorsMapPath: 'authors.yml',
+      authorsBaseRoutePath: '/authors',
+      baseUrl: '/baseUrl',
+    });
+    expect(authorsMap).toBeDefined();
+    expect(authorsMap?.ozaki?.imageURL).toBe('/baseUrl/img/ozaki.jpg');
+  });
 });
 
 describe('validateAuthorsMapInput', () => {

diff --git a/packages/docusaurus-plugin-content-blog/src/authorsMap.ts b/packages/docusaurus-plugin-content-blog/src/authorsMap.ts
@@ -93,10 +93,12 @@ export function checkAuthorsMapPermalinkCollisions(
 function normalizeAuthor({
   authorsBaseRoutePath,
   authorKey,
+  baseUrl,
   author,
 }: {
   authorsBaseRoutePath: string;
   authorKey: string;
+  baseUrl: string;
   author: AuthorInput;
 }): Author & {key: string} {
   function getAuthorPage(): AuthorPage | null {
@@ -109,24 +111,30 @@ function normalizeAuthor({
       permalink: normalizeUrl([authorsBaseRoutePath, slug]),
     };
   }
+  console.log('baseUrl:', baseUrl);
 
   return {
     ...author,
     key: authorKey,
     page: getAuthorPage(),
+    imageURL: author.imageURL?.startsWith('/')
+      ? normalizeUrl([baseUrl, author.imageURL])
+      : author.imageURL,
     socials: author.socials ? normalizeSocials(author.socials) : undefined,
   };
 }
 
 function normalizeAuthorsMap({
   authorsBaseRoutePath,
   authorsMapInput,
+  baseUrl,
 }: {
   authorsBaseRoutePath: string;
   authorsMapInput: AuthorsMapInput;
+  baseUrl: string;
 }): AuthorsMap {
   return _.mapValues(authorsMapInput, (author, authorKey) => {
-    return normalizeAuthor({authorsBaseRoutePath, authorKey, author});
+    return normalizeAuthor({authorsBaseRoutePath, authorKey, author, baseUrl});
   });
 }
 
@@ -153,6 +161,7 @@ export async function getAuthorsMap(params: {
   authorsMapPath: string;
   authorsBaseRoutePath: string;
   contentPaths: BlogContentPaths;
+  baseUrl: string;
 }): Promise<AuthorsMap | undefined> {
   const authorsMapInput = await getAuthorsMapInput(params);
   if (!authorsMapInput) {

diff --git a/packages/docusaurus-plugin-content-blog/src/index.ts b/packages/docusaurus-plugin-content-blog/src/index.ts
@@ -177,6 +177,7 @@ export default async function pluginContentBlog(
           routeBasePath,
           authorsBasePath,
         ]),
+        baseUrl,
       });
       checkAuthorsMapPermalinkCollisions(authorsMap);