get site value from environment

Author: eric-burel

packages/astro/src/default/components/MetaTags.astro

@@ -11,13 +11,13 @@ const { meta = {} } = Astro.props;
 const site = Astro.site?.toString();
 let imageUrl;
 if (meta.image) {
-  imageUrl = readPublicImage(meta.image, site);
+  imageUrl = readPublicImage(meta.image, true);
   if (!imageUrl) {
     console.warn(`Image ${meta.image} not found in "/public" folder`);
   }
 }
-imageUrl ??= readLogoFile('logo', site);
-const faviconUrl = readFaviconFile('favicon', site);
+imageUrl ??= readLogoFile('logo', true);
+const faviconUrl = readFaviconFile('favicon', true);
 ---
 
 <meta charset="UTF-8" />

packages/astro/src/default/utils/favicon.ts

@@ -1,6 +1,6 @@
 import { readPublicImage } from './publicImage';
 
-export function readFaviconFile(faviconPrefix: string = 'favicon', site?: string) {
+export function readFaviconFile(faviconPrefix: string = 'favicon', absolute?: boolean) {
   const faviconFilename = `${faviconPrefix}.svg`;
-  return readPublicImage(faviconFilename, site);
+  return readPublicImage(faviconFilename, absolute);
 }

packages/astro/src/default/utils/logo.ts

@@ -1,12 +1,12 @@
 import { LOGO_EXTENSIONS } from './constants';
 import { readPublicImage } from './publicImage';
 
-export function readLogoFile(logoPrefix: string = 'logo', site?: string) {
+export function readLogoFile(logoPrefix: string = 'logo', absolute?: boolean) {
   let logo;
 
   for (const logoExt of LOGO_EXTENSIONS) {
     const logoFilename = `${logoPrefix}.${logoExt}`;
-    logo = readPublicImage(logoFilename, site);
+    logo = readPublicImage(logoFilename, absolute);
 
     if (logo) {
       break;

packages/astro/src/default/utils/publicImage.ts

@@ -2,7 +2,7 @@ import fs from 'node:fs';
 import path from 'node:path';
 import { joinPaths } from './url';
 
-export function readPublicImage(filename: string, site?: string) {
+export function readPublicImage(filename: string, absolute?: boolean) {
   let image;
   const exists = fs.existsSync(path.join('public', filename));
 
@@ -12,8 +12,14 @@ export function readPublicImage(filename: string, site?: string) {
 
   image = joinPaths(import.meta.env.BASE_URL, filename);
 
-  if (site) {
-    image = joinPaths(site, image);
+  if (absolute) {
+    const site = import.meta.env.SITE;
+
+    if (!site) {
+      console.warn('Trying to compute an absolute file URL but Astro.site is not set.');
+    } else {
+      image = joinPaths(site, image);
+    }
   }
 
   return image;